diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7ca239e669..3f6f0bfb69d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2237,6 +2237,10 @@ If there are any bugs, improvements, optimizations or any new feature proposal f
 -   Interface `MetaMaskProvider` added and is part of `SupportedProviders` (#6534)
 -   `gasPrice` was added to `Transaction1559UnsignedAPI` type. (#6539)
 
+#### web3-eth-accounts
+
+-   Added support for `ETNIP-1 PriorityTransactions`
+
 ### Changed
 
 #### web3
diff --git a/docs/docs/guides/advanced/support_additional_rpc_methods/index.md b/docs/docs/guides/advanced/support_additional_rpc_methods/index.md
index 7416551603f..c44fdc3eb08 100644
--- a/docs/docs/guides/advanced/support_additional_rpc_methods/index.md
+++ b/docs/docs/guides/advanced/support_additional_rpc_methods/index.md
@@ -24,7 +24,7 @@ This will give your plugin access to [requestManager](/api/web3-core/class/Web3C
 :::caution
 
 ```ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 	// step 1
@@ -35,7 +35,7 @@ export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 2. After that add public `pluginNamespace` property. This will be used to access your plugin, as mentioned in step number 5 code example.
 
 ```ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods'; // step 2
@@ -45,7 +45,7 @@ export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 3. Once plugin class is created using above mentioned steps, its very easy to add new RPC methods like:
 
 ```ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods';
@@ -64,7 +64,7 @@ export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 4. Final step is setting up module [augmentation](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation), this will allow you to access plugin on web3 object.
 
 ```ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export default class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods';
@@ -99,8 +99,8 @@ After the plugin is ready, it is recommended to publish it on the NPM registry.
 Once plugin is registered its custom methods will be available to use.
 
 ```ts
-import { Web3 } from 'web3';
-import CustomRpcMethodsPlugin from 'web3-plugin-example';
+import { Web3 } from '@etn-sc/web3';
+import CustomRpcMethodsPlugin from '@etn-sc/web3-plugin-example';
 
 const web3 = new Web3('http://127.0.0.1:8545');
 web3.registerPlugin(new CustomRpcMethodsPlugin()); // step 5
diff --git a/docs/docs/guides/advanced/web3_tree_shaking_support_guide/index.md b/docs/docs/guides/advanced/web3_tree_shaking_support_guide/index.md
index 4df076a42e7..3ed564f5fb5 100644
--- a/docs/docs/guides/advanced/web3_tree_shaking_support_guide/index.md
+++ b/docs/docs/guides/advanced/web3_tree_shaking_support_guide/index.md
@@ -31,13 +31,13 @@ For further information about `sideEffects` see [webpack docs](https://webpack.j
     For example, if you need `web.eth`:
 
 ```ts
-import Web3Eth from 'web3-eth';
+import Web3Eth from '@etn-sc/web3-eth';
 ```
 
 If you only need a few functions from `web3-utils`:
 
 ```ts
-import { numberToHex, hexToNumber } from 'web3-utils';
+import { numberToHex, hexToNumber } from '@etn-sc/web3-utils';
 ```
 
 You can find an example app with tree shaking [here](https://github.com/ChainSafe/web3js-example-react-app).
diff --git a/docs/docs/guides/basics/eth.md b/docs/docs/guides/basics/eth.md
index 51d38c67bb9..ce525893dd2 100644
--- a/docs/docs/guides/basics/eth.md
+++ b/docs/docs/guides/basics/eth.md
@@ -65,7 +65,7 @@ Note that we are installing the latest version of 4.x, at the time of this tutor
 Next, create a new file called `index.ts` in your project directory and add the following code to it:
 
 ```javascript
-const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from 'web3'`)
+const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from '@etn-sc/web3'`)
 
 // Set up a connection to the Ganache network
 const web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:7545'));
@@ -99,7 +99,7 @@ In the first example, we are going to send a simple value transaction.
 Create a file named `transaction.ts` and fill it with the following code:
 
 ```typescript
-const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from 'web3'`)
+const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from '@etn-sc/web3'`)
 const fs = require('fs');
 const path = require('path');
 
@@ -202,7 +202,7 @@ transactionHash {
 In the next example, we are going to use `estimateGas` function to see the expected gas for contract deployment. (For more on contracts, please see the corresponding tutotial). Create a file named `estimate.ts` and fill it with the following code:
 
 ```typescript
-import Web3, { ETH_DATA_FORMAT, DEFAULT_RETURN_FORMAT } from 'web3';
+import Web3, { ETH_DATA_FORMAT, DEFAULT_RETURN_FORMAT } from '@etn-sc/web3';
 
 async function estimate() {
 	// abi of our contract
@@ -284,7 +284,7 @@ If everything is working correctly, you should see something like the following:
 In the next example we are going to sign a transaction and use `sendSignedTransaction` to send the signed transaction. Create a file named `sendSigned.ts` and fill it with the following code:
 
 ```typescript
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 const web3 = new Web3('http://localhost:7545');
 
 //make sure to copy the private key from ganache
diff --git a/docs/docs/guides/basics/sign_and_send_tx/local_wallet.md b/docs/docs/guides/basics/sign_and_send_tx/local_wallet.md
index 4637f539b67..d5c891e3a59 100644
--- a/docs/docs/guides/basics/sign_and_send_tx/local_wallet.md
+++ b/docs/docs/guides/basics/sign_and_send_tx/local_wallet.md
@@ -11,7 +11,7 @@ The simplest way to sign and send transactions is using a local wallet:
 
 ```ts
 // First step: initialize `web3` instance
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 const web3 = new Web3(/* PROVIDER*/);
 
 // Second step: add an account to wallet
@@ -45,7 +45,7 @@ List of references:
 
 ```ts
 // First step: initialize `web3` instance
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 const web3 = new Web3(/* PROVIDER*/);
 
 // Second step: add an account to wallet
diff --git a/docs/docs/guides/basics/sign_and_send_tx/wallet_of_eth_node.md b/docs/docs/guides/basics/sign_and_send_tx/wallet_of_eth_node.md
index f53d412a11e..f6b8ad630c2 100644
--- a/docs/docs/guides/basics/sign_and_send_tx/wallet_of_eth_node.md
+++ b/docs/docs/guides/basics/sign_and_send_tx/wallet_of_eth_node.md
@@ -11,7 +11,7 @@ If Ethereum node has unlocked account in its wallet you can send transaction wit
 
 ```ts
 // First step: initialize web3 instance
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 const web3 = new Web3(/* PROVIDER*/);
 
 // Second step: add an account to the Ethereum node and unlock it
@@ -54,7 +54,7 @@ List of references:
 
 ```ts
 // First step: initialize web3 instance
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 const web3 = new Web3(/* PROVIDER*/);
 
 // Second step: add an account to the Ethereum node and unlock it
diff --git a/docs/docs/guides/smart_contracts/deploying_and_interacting_with_smart_contracts.md b/docs/docs/guides/smart_contracts/deploying_and_interacting_with_smart_contracts.md
index f6c1353cd37..e1f81e18da4 100644
--- a/docs/docs/guides/smart_contracts/deploying_and_interacting_with_smart_contracts.md
+++ b/docs/docs/guides/smart_contracts/deploying_and_interacting_with_smart_contracts.md
@@ -179,7 +179,7 @@ Note that we are installing the latest version of 4.x, at the time of this tutor
 Next, create a new file called `index.js` in your project directory and add the following code to it:
 
 ```javascript
-const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from 'web3'`)
+const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from '@etn-sc/web3'`)
 
 // Set up a connection to the Ganache network
 const web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:7545'));
@@ -214,7 +214,7 @@ Create a file named `deploy.js` and fill it with the following code:
 ```javascript
 // For simplicity we use `web3` package here. However, if you are concerned with the size,
 //	you may import individual packages like 'web3-eth', 'web3-eth-contract' and 'web3-providers-http'.
-const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from 'web3'`)
+const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from '@etn-sc/web3'`)
 const fs = require('fs');
 const path = require('path');
 
@@ -289,7 +289,7 @@ In this step, we will use web3.js to interact with the smart contract on the Gan
 Create a file named `interact.js` and fill it with the following code:
 
 ```javascript
-const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from 'web3'`)
+const { Web3 } = require('web3'); //  web3.js has native ESM builds and (`import Web3 from '@etn-sc/web3'`)
 const fs = require('fs');
 const path = require('path');
 
@@ -369,7 +369,7 @@ Here are examples:
 ```typescript
 
 // Configuring Web3Context with `contractDataInputFill`
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 
 const expectedProvider = 'http://127.0.0.1:8545';
 const web3Context = new Web3Context({
diff --git a/docs/docs/guides/smart_contracts/infer_contract_types_guide/index.md b/docs/docs/guides/smart_contracts/infer_contract_types_guide/index.md
index c6051b7bd41..52afef52827 100644
--- a/docs/docs/guides/smart_contracts/infer_contract_types_guide/index.md
+++ b/docs/docs/guides/smart_contracts/infer_contract_types_guide/index.md
@@ -11,7 +11,7 @@ Before we dive into the problem, let's take a quick look at the problem. Web3.js
 Web3.js uses ABI type to dynamically load available methods and events but Typescript currently [doesn't support loading JSON as const](https://github.com/microsoft/TypeScript/issues/32063). If you go to the [Playground Link](https://www.typescriptlang.org/play?#code/MYewdgzgLgBAhgIwJYwLwwNoCga5gbxz1wCIkwAHAVyghIC5MjjdCWWywoBTAJzDgAbACoBPCtwYwS0XuQDmJADTN20gQFtJjEpu4B9ZavYko47dNkKSxvAF8VagreKce-IWIlSZUOWEVHJ3U4LR8IUQ0EEEFDIKdTc3C-axcYO1sAXXi8XzgeAFkaRCRBJDMfMHAKOFFEQUkc0jNvHVBIPypgKBBeG2IHVTYOOCqwSJAqOkYAMyEIbibpcmpaKWwnYYTyABNuAA9uHalOxbTScncBESSdOB2d3m4IOiXXPR8QAHcwPiNg6QtCwke6PZ50NKDTbnZZgPaHY6MU5vXKXPjXLzA0FPF7-YK6ULAiASOF-FHNW7SbHg-pqKFqLZqTjwo5SOaCBbk2FXTyUkhUS4AJgArAA2PEJD46ABuQiojRhiVa0gFXBF4shWSWBLCOgAghQKLwQLLBBLckCfNxpdwuLTcPTWLYQWMJlM2fMziYVjRpkxoQDmQdWUjePKuW50bzlSCHjjXoqpdIZsaNOaTJa7nGaZCUYzvaSEScw178WiPDcY9TcRGk6YQOmOJmqdncbm0vmOLtg4iYOzOYryxi+aqoOrG+9CT5TfKJxaR0KxfaWBl2NlnXXhLxRhAZmTnc2SNbbVBl47nAXVn6NgzB1wo5Wsa2E4G699fn0I4fqxCnOfiJ2rhDtGT5gjWiZTjoxK2nsn6Kt+z7LgMWobpBVKCII3yjMAComJMUBXusHZ3jyj4+KO461mhJBzhSMYUUumprtq0D5NwRRQCUZQVDKSDcF8jZKsCMxUGA3RIOAZ45J2nCEYwN7sIBqL3hWmI+D+tEhLqlgkrBmlCepiHtgGZYqcO9GLuKVHaSCGiTHaX4LmqjF-ihJh1nAhrGjagn4XJ-q3oGwFkTo0QxPpdb6YeYVmkxLDriYrGFMUyDcaIlTVLU9S4U2fIiWJUASWAUlDM6PprPJxFBWZIGGWBL74h5wCgKJp6OVWRmucxqE2QgQjYdwADyMy+TQ-kKSwSkXDVIUqpZEXUVFTlji5dJuRwSXsSlpTlOlvH8YJh75eJkmqOeMnldeCUcHWezAEgGjzKNBG+kRJnbDNak6KOAAcC02UtFlcH9cXENdribRxXG7dOfECdqR2iSdxVndJZWUK9lXvUywVfS29X-USun7oGCEE8ZgWmaReP8vN1lElQCB+HA3RHAAanKOUJIeDEal18Xard3DAE8cALHqGFYWJXO5H5mMBYpJEPjTMWEz4gPAqroN4ODuSQ9taUZZQWUIA0h15UjhWnQMaOXvLE0AUrql8hp9PhMTcGky7nV0nmTvmcCvNq1mew7Bzgizu1gfzdruC66QdbkCL3Bi9wEuYV8A3PeNVVU8rfKq27Ogaz4Wv82DLGcclnGpTDOhjDUdSmzLdHCZbRUlY7dsVZg8dacCHzanLPcO3gU3cvnMZWAEwfSCXUEpDPscwH3eTV9DPHSNKcPmzGx1WyjNuld3V2C9RERROFQ9jfbucfdTfLT4EEEA1HyT+Ioy+r-rNc7ZvJDbwOgjC2BUO6o2Pl2DGI9V51h6JxQQABlKghpBDpWvi9Eed8cafWWpRF+wJ55zWcnzNa3VEpVy2r-Q2+14YHhAcjTuY90Y52xgWB+HUCZF0BA2N+Id4xIXsH7aq7Do7ENnrZeybV4K4NWuwVcAserAmZpAPcnsODD2vFgthk9NYgCvvg9WvDpBl1IQo8hbEoa13-g3E2ZtgF73btbQRECgJQM0awyBIi6r8K4SQFMIA0xGNjOTP8Qi87Ow4T4gxOgeiEOCfwimithE6PInTaJVI7KtTiUHL+Z8bLKN3HwAAYqmbOt8PGuK8aFPRZpfFxJMXI9aEMKGWL-ntdQmUm52LoQ40BTiHREEyPACAMB2jQAANxAA) and choose ".d.ts" you can check type difference with and without `as const`.
 
 ```typescript
-import { Contract, Web3 } from 'web3';
+import { Contract, Web3 } from '@etn-sc/web3';
 import ERC20 from './node_modules/@openzeppelin/contracts/build/contracts/ERC20.json';
 
 (async function () {
@@ -100,7 +100,7 @@ and run the script with `node -r ts-node/register <script name>.ts <destination>
 use those generated files in your code:
 
 ```typescript
-import { Contract, ContractAbi, Web3 } from 'web3';
+import { Contract, ContractAbi, Web3 } from '@etn-sc/web3';
 import ERC20 from './artifacts/ERC20';
 
 (async function () {
diff --git a/docs/docs/guides/web3_plugin_guide/plugin_authors.md b/docs/docs/guides/web3_plugin_guide/plugin_authors.md
index 31f26d6ce3f..9d5154deff3 100644
--- a/docs/docs/guides/web3_plugin_guide/plugin_authors.md
+++ b/docs/docs/guides/web3_plugin_guide/plugin_authors.md
@@ -41,14 +41,14 @@ Furthermore, you have the flexibility to expand your range of transaction types,
 
 ```typescript
 // create new TransactionType class which extends BaseTransaction class
-import { BaseTransaction } from 'web3-eth-accounts';
+import { BaseTransaction } from '@etn-sc/web3-eth-accounts';
 const TRANSACTION_TYPE = 15;
 class SomeNewTxTypeTransaction extends BaseTransaction {
     // ...
 }
 
 // create new plugin and add `SomeNewTxTypeTransaction` to the library
-import { Web3EthPluginBase } from 'web3';
+import { Web3EthPluginBase } from '@etn-sc/web3';
 
 class SomeNewTxTypeTransactionPlugin extends Web3PluginBase {
    public pluginNamespace = 'someNewTxTypeTransaction';
@@ -64,7 +64,7 @@ class SomeNewTxTypeTransactionPlugin extends Web3PluginBase {
 Your plugin class should `extend` the `Web3PluginBase` abstract class. This class `extends` [Web3Context](/api/web3-core/class/Web3Context) and when the user registers your plugin with a class, your plugin's `Web3Context` will point to the module's `Web3Context` giving your plugin access to things such as user configured [requestManager](/api/web3-core/class/Web3Context#requestManager) and [accountProvider](/api/web3-core/class/Web3Context#accountProvider).
 
 ```typescript
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export class CustomRpcMethodsPlugin extends Web3PluginBase { ... }
 ```
@@ -74,7 +74,7 @@ export class CustomRpcMethodsPlugin extends Web3PluginBase { ... }
 In addition to `Web3PluginBase`, you can choose to extend `Web3EthPluginBase` which will provide the [Ethereum JSON RPC API interface](/api/web3-types#EthExecutionAPI), which packages such as `Web3Eth` use, as a generic to your plugin's `requestManager`, giving it type support for the [Ethereum JSON RPC spec](https://ethereum.github.io/execution-apis/api-documentation/). This would be the recommended approach if your plugin makes Ethereum JSON RPC calls directly to a provider using web3's provided `requestManager`.
 
 ```typescript
-import { Web3EthPluginBase } from 'web3';
+import { Web3EthPluginBase } from '@etn-sc/web3';
 
 export class CustomRpcMethodsPlugin extends Web3EthPluginBase { ... }
 ```
@@ -87,7 +87,7 @@ The following represents your plugin code:
 
 ```typescript
 // custom_rpc_methods_plugin.ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods';
@@ -102,7 +102,7 @@ The following represents the plugin user's code:
 
 ```typescript
 // registering_a_plugin.ts
-import { Web3Context } from 'web3';
+import { Web3Context } from '@etn-sc/web3';
 
 import { CustomRpcMethodsPlugin } from './custom_rpc_methods_plugin';
 
@@ -117,7 +117,7 @@ await web3Context.customRpcMethods.someMethod();
 Below is an example of `CustomRpcMethodsPlugin` making use of `this.requestManager` which will have access to an Ethereum provider if one was configured by the user. In the event that no `provider` was set by the user, the below code will throw a [ProviderError](/api/web3-errors/class/ProviderError) if `customRpcMethod` was to be called:
 
 ```typescript
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods';
@@ -135,7 +135,7 @@ Below depicts a plugin user's code that does not configure an Ethereum provider,
 
 ```typescript
 // registering_a_plugin.ts
-import { Web3Context } from 'web3';
+import { Web3Context } from '@etn-sc/web3';
 
 import { CustomRpcMethodsPlugin } from './custom_rpc_methods_plugin';
 
@@ -158,7 +158,7 @@ ProviderError: Provider not available. Use `.setProvider` or `.provider=` to ini
 If needed, you can provide an API type (that follows the [Web3ApiSpec](/api/web3-types#Web3APISpec) pattern) as a generic to `Web3PluginBase` that will add type hinting to the `requestManager` when developing your plugin. In the below code, this is the `CustomRpcApi` type that's being passed as `Web3PluginBase<CustomRpcApi>`
 
 ```typescript
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 type CustomRpcApi = {
 	custom_rpc_method_with_parameters: (parameter1: string, parameter2: number) => string;
@@ -185,7 +185,7 @@ There currently exists [an issue](https://github.com/web3/web3.js/issues/5492) w
 A workaround for this issue is available, below is an example of it:
 
 ```typescript
-import { Contract, ContractAbi, Web3Context, Web3PluginBase, types, utils } from 'web3';
+import { Contract, ContractAbi, Web3Context, Web3PluginBase, types, utils } from '@etn-sc/web3';
 
 import { ERC20TokenAbi } from './ERC20Token';
 
@@ -252,7 +252,7 @@ When registering a plugin, you're adding additional methods and/or classes to th
 
 ```typescript
 // custom_rpc_methods_plugin.ts
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export class CustomRpcMethodsPlugin extends Web3PluginBase {
 	public pluginNamespace = 'customRpcMethods';
diff --git a/docs/docs/guides/web3_plugin_guide/plugin_users.md b/docs/docs/guides/web3_plugin_guide/plugin_users.md
index 90819cdacfe..42c0d1cb27b 100644
--- a/docs/docs/guides/web3_plugin_guide/plugin_users.md
+++ b/docs/docs/guides/web3_plugin_guide/plugin_users.md
@@ -32,7 +32,7 @@ For illustration purposes, let's assume a plugin developer has the following cod
 ```typescript
 // code written by the plugin **developer**
 
-import { Web3PluginBase } from 'web3';
+import { Web3PluginBase } from '@etn-sc/web3';
 
 export class PluginExample extends Web3PluginBase {
 	public pluginNamespace = 'pluginExample';
@@ -55,8 +55,8 @@ Here is an example of how to register the `PluginExample` onto an instance of `W
 ```typescript
 // code written by the plugin **user**
 
-import Web3 from 'web3';
-import PluginExample from 'web3-plugin-example';
+import Web3 from '@etn-sc/web3';
+import PluginExample from '@etn-sc/web3-plugin-example';
 
 const web3 = new Web3('http://127.0.0.1:8545');
 web3.registerPlugin(new PluginExample(any_parameters, if_needed));
diff --git a/docs/docs/guides/web3_providers_guide/events_listening.md b/docs/docs/guides/web3_providers_guide/events_listening.md
index cb1cdb9dec0..5be63c0d986 100644
--- a/docs/docs/guides/web3_providers_guide/events_listening.md
+++ b/docs/docs/guides/web3_providers_guide/events_listening.md
@@ -21,7 +21,7 @@ Actually, the events can be categorized as follows ([according to EIP 1193](http
 Below a sample code for listening and remove listening to EIP 1193 events:
 
 ```ts
-import Web3 from 'web3'
+import Web3 from '@etn-sc/web3'
 
 const web3 = new Web3(/* PROVIDER*/);
 
diff --git a/docs/docs/guides/web3_providers_guide/index.md b/docs/docs/guides/web3_providers_guide/index.md
index 9a03cbefef7..0fdafacbbf8 100644
--- a/docs/docs/guides/web3_providers_guide/index.md
+++ b/docs/docs/guides/web3_providers_guide/index.md
@@ -12,7 +12,7 @@ web3.js providers are objects responsible for enabling connectivity with the Eth
 Connecting to a chain happens through a provider. You can pass the provider to the constructor as in the following example:
 
 ```ts
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 
 const web3 = new Web3(/* PROVIDER*/);
 
diff --git a/docs/docs/guides/web3_upgrade_guide/1.x/index.md b/docs/docs/guides/web3_upgrade_guide/1.x/index.md
index a8f1a205bbd..6a69d8b585d 100644
--- a/docs/docs/guides/web3_upgrade_guide/1.x/index.md
+++ b/docs/docs/guides/web3_upgrade_guide/1.x/index.md
@@ -116,24 +116,24 @@ We don't encourage using the `@types/web3` package.
 ```ts
 // Provider types
 // in 1.x
-import type { Provider, Callback, JsonRPCResponse } from 'web3/providers';
+import type { Provider, Callback, JsonRPCResponse } from '@etn-sc/web3/providers';
 
 // in 4.x
 import type {
 	Web3BaseProvider as Provider,
 	Web3ProviderRequestCallback as Callback,
 	JsonRpcResponse,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 ```
 
 Similarly some useable types from the old package `web3-core` are also moved to `web3-types`
 
 ```ts
 // in 1.x
-import type { Transaction, TransactionReceipt } from 'web3-core';
+import type { Transaction, TransactionReceipt } from '@etn-sc/web3-core';
 
 // in 4.x
-import type { Transaction, TransactionReceipt } from 'web3-types';
+import type { Transaction, TransactionReceipt } from '@etn-sc/web3-types';
 ```
 
 ### Web3 Extend
@@ -196,10 +196,10 @@ Starting 4.x releases, the package `web3-core-helpers` will not be maintained an
 
 ```ts
 // in 1.x
-import { formatters } from 'web3-core-helpers';
+import { formatters } from '@etn-sc/web3-core-helpers';
 
 // in 4.x
-import { formatters } from 'web3-core';
+import { formatters } from '@etn-sc/web3-core';
 ```
 
 ### PromiEvent
@@ -208,10 +208,10 @@ Starting 4.x releases, the package `web3-core-promievent` will not be maintained
 
 ```ts
 // in 1.x
-import Web3PromiEvent from 'web3-core-promievent';
+import Web3PromiEvent from '@etn-sc/web3-core-promievent';
 
 // in 4.x
-import { Web3PromiEvent } from 'web3-core';
+import { Web3PromiEvent } from '@etn-sc/web3-core';
 ```
 
 The `PromiEvent` class does not support `removeEventListener` or `addEventListener`. Instead we recommend to use `on` and `off`.
diff --git a/docs/docs/guides/web3_upgrade_guide/1.x/providers_migration_guide.md b/docs/docs/guides/web3_upgrade_guide/1.x/providers_migration_guide.md
index 8a59b8e0e2d..a9cd5d6534b 100644
--- a/docs/docs/guides/web3_upgrade_guide/1.x/providers_migration_guide.md
+++ b/docs/docs/guides/web3_upgrade_guide/1.x/providers_migration_guide.md
@@ -245,7 +245,7 @@ You can use it by installing `web3-providers-ipc` and creating a new instance. S
 you can pass it on to the Web3 instance.
 
 ```ts
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 
 const ipcProvider = new IpcProvider('/Users/myuser/Library/Ethereum/geth.ipc');
 ```
diff --git a/docs/docs/guides/web3_upgrade_guide/1.x/web3_utils_migration_guide.md b/docs/docs/guides/web3_upgrade_guide/1.x/web3_utils_migration_guide.md
index 1b7410aa197..72e28bc6c14 100644
--- a/docs/docs/guides/web3_upgrade_guide/1.x/web3_utils_migration_guide.md
+++ b/docs/docs/guides/web3_upgrade_guide/1.x/web3_utils_migration_guide.md
@@ -11,10 +11,10 @@ To make use you only import the utility functions which are needed by your app.
 
 ```ts
 // 1.x
-import web3Utils from 'web3-utils';
+import web3Utils from '@etn-sc/web3-utils';
 
 // 4.x
-import * as web3Utils from 'web3-utils';
+import * as web3Utils from '@etn-sc/web3-utils';
 ```
 
 ## Unit conversion functions
diff --git a/package.json b/package.json
index c136d147f66..77942e45311 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-	"name": "web3.js",
+	"name": "@etn-sc/web3.js",
 	"private": true,
-	"description": "Ethereum API wrappers and utilities",
-	"author": "ChainSafe Systems",
+	"description": "Electroneum SmartChain API wrappers and utilities",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"keywords": [
 		"ethereum",
@@ -10,15 +10,17 @@
 		"web3",
 		"web3js",
 		"web3.js",
-		"blockchain"
+		"blockchain",
+		"electroneum",
+		"etn"
 	],
-	"homepage": "https://github.com/ChainSafe/web3.js#readme",
+	"homepage": "https://github.com/electroneum/electroneum-web3.js#readme",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/ChainSafe/web3.js.git"
+		"url": "git+https://github.com/electroneum/electroneum-web3.js.git"
 	},
 	"bugs": {
-		"url": "https://github.com/ChainSafe/web3.js/issues"
+		"url": "https://github.com/electroneum/electroneum-web3.js/issues"
 	},
 	"engines": {
 		"node": ">=14",
diff --git a/packages/web3-core/README.md b/packages/web3-core/README.md
index a5a2110742c..90fc606e117 100644
--- a/packages/web3-core/README.md
+++ b/packages/web3-core/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-core` package contains core functions for [web3.js][repo] packages.
+`@etn-sc/web3-core` package contains core functions for [@etn-sc/web3.js][repo] packages.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-core) or using [Yarn](https://yarnpkg.com/package/web3-core)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-core)
 
 ### Using NPM
 
 ```bash
-npm install web3-core
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-core
+npm install @etn-sc/web3-core
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-core
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-core
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-core
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-core%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-core
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-core
 [downloads-image]: https://img.shields.io/npm/dm/web3-core?label=npm%20downloads
diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
index 8db0707032b..95d9bb96948 100644
--- a/packages/web3-core/package.json
+++ b/packages/web3-core/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-core",
+	"name": "@etn-sc/web3-core",
 	"version": "4.3.1",
 	"description": "Web3 core tools for sub-packages. This is an internal package.",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -42,16 +42,16 @@
 		"test:integration": "jest --config=./test/integration/jest.config.js --passWithNoTests"
 	},
 	"dependencies": {
-		"web3-errors": "^1.1.4",
-		"web3-eth-iban": "^4.0.7",
-		"web3-providers-http": "^4.1.0",
-		"web3-providers-ws": "^4.0.7",
-		"web3-types": "^1.3.1",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-errors": "^1.1.4",
+		"@etn-sc/web3-eth-iban": "^4.0.7",
+		"@etn-sc/web3-providers-http": "^4.1.0",
+		"@etn-sc/web3-providers-ws": "^4.0.7",
+		"@etn-sc/web3-types": "^1.3.1",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	},
 	"optionalDependencies": {
-		"web3-providers-ipc": "^4.0.7"
+		"@etn-sc/web3-providers-ipc": "^4.0.7"
 	},
 	"devDependencies": {
 		"@types/jest": "^28.1.6",
diff --git a/packages/web3-core/src/formatters.ts b/packages/web3-core/src/formatters.ts
index b6d6af3bd3b..4423b4f1a5c 100644
--- a/packages/web3-core/src/formatters.ts
+++ b/packages/web3-core/src/formatters.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { FormatterError } from 'web3-errors';
-import { Iban } from 'web3-eth-iban';
+import { FormatterError } from '@etn-sc/web3-errors';
+import { Iban } from '@etn-sc/web3-eth-iban';
 import {
 	BlockTags,
 	Filter,
@@ -36,7 +36,7 @@ import {
 	SyncOutput,
 	TransactionInput,
 	TransactionOutput,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import {
 	fromUtf8,
 	hexToNumber,
@@ -50,8 +50,8 @@ import {
 	toNumber,
 	toUtf8,
 	utf8ToHex,
-} from 'web3-utils';
-import { isBlockTag, isHex, isNullish } from 'web3-validator';
+} from '@etn-sc/web3-utils';
+import { isBlockTag, isHex, isNullish } from '@etn-sc/web3-validator';
 
 /* eslint-disable deprecation/deprecation */
 /**
diff --git a/packages/web3-core/src/types.ts b/packages/web3-core/src/types.ts
index 3f4e66d1f52..9c9e45a36b5 100644
--- a/packages/web3-core/src/types.ts
+++ b/packages/web3-core/src/types.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { HexString, Transaction } from 'web3-types';
+import { HexString, Transaction } from '@etn-sc/web3-types';
 
 export type TransactionTypeParser = (
 	transaction: Transaction,
diff --git a/packages/web3-core/src/utils.ts b/packages/web3-core/src/utils.ts
index 34c5162c488..7726a86169d 100644
--- a/packages/web3-core/src/utils.ts
+++ b/packages/web3-core/src/utils.ts
@@ -24,7 +24,7 @@ import {
 	Web3APISpec,
 	Web3BaseProvider,
 	MetaMaskProvider,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 export const isWeb3Provider = <API extends Web3APISpec>(
 	provider: SupportedProviders<API>,
diff --git a/packages/web3-core/src/web3_batch_request.ts b/packages/web3-core/src/web3_batch_request.ts
index 10a3eaf4693..2e1b5b231ed 100644
--- a/packages/web3-core/src/web3_batch_request.ts
+++ b/packages/web3-core/src/web3_batch_request.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { JsonRpcBatchResponse, JsonRpcOptionalRequest, JsonRpcRequest } from 'web3-types';
-import { jsonRpc, Web3DeferredPromise } from 'web3-utils';
-import { OperationAbortError, OperationTimeoutError, ResponseError } from 'web3-errors';
+import { JsonRpcBatchResponse, JsonRpcOptionalRequest, JsonRpcRequest } from '@etn-sc/web3-types';
+import { jsonRpc, Web3DeferredPromise } from '@etn-sc/web3-utils';
+import { OperationAbortError, OperationTimeoutError, ResponseError } from '@etn-sc/web3-errors';
 import { Web3RequestManager } from './web3_request_manager.js';
 
 export const DEFAULT_BATCH_REQUEST_TIMEOUT = 1000;
diff --git a/packages/web3-core/src/web3_config.ts b/packages/web3-core/src/web3_config.ts
index a8dffebab03..7a0abe6f255 100644
--- a/packages/web3-core/src/web3_config.ts
+++ b/packages/web3-core/src/web3_config.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Numbers, HexString, BlockNumberOrTag, Common } from 'web3-types';
-import { ConfigHardforkMismatchError, ConfigChainMismatchError } from 'web3-errors';
-import { isNullish, toHex } from 'web3-utils';
+import { Numbers, HexString, BlockNumberOrTag, Common } from '@etn-sc/web3-types';
+import { ConfigHardforkMismatchError, ConfigChainMismatchError } from '@etn-sc/web3-errors';
+import { isNullish, toHex } from '@etn-sc/web3-utils';
 import { TransactionTypeParser } from './types.js';
 // eslint-disable-next-line import/no-cycle
 import { TransactionBuilder } from './web3_context.js';
diff --git a/packages/web3-core/src/web3_context.ts b/packages/web3-core/src/web3_context.ts
index f653b581456..d5f58b6f130 100644
--- a/packages/web3-core/src/web3_context.ts
+++ b/packages/web3-core/src/web3_context.ts
@@ -25,9 +25,9 @@ import {
 	EthExecutionAPI,
 	Web3BaseProvider,
 	Transaction,
-} from 'web3-types';
-import { isNullish } from 'web3-utils';
-import { ExistingPluginNamespaceError } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-utils';
+import { ExistingPluginNamespaceError } from '@etn-sc/web3-errors';
 
 import { isSupportedProvider } from './utils.js';
 // eslint-disable-next-line import/no-cycle
diff --git a/packages/web3-core/src/web3_event_emitter.ts b/packages/web3-core/src/web3_event_emitter.ts
index 36180c51df3..c2df6cebe03 100644
--- a/packages/web3-core/src/web3_event_emitter.ts
+++ b/packages/web3-core/src/web3_event_emitter.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EventEmitter } from 'web3-utils';
+import { EventEmitter } from '@etn-sc/web3-utils';
 
 export type Web3EventMap = Record<string, unknown>;
 export type Web3EventKey<T extends Web3EventMap> = string & keyof T;
diff --git a/packages/web3-core/src/web3_request_manager.ts b/packages/web3-core/src/web3_request_manager.ts
index 5fe063a7881..4c2481ddc54 100644
--- a/packages/web3-core/src/web3_request_manager.ts
+++ b/packages/web3-core/src/web3_request_manager.ts
@@ -22,9 +22,9 @@ import {
 	ResponseError,
 	rpcErrorsMap,
 	RpcError,
-} from 'web3-errors';
-import HttpProvider from 'web3-providers-http';
-import WSProvider from 'web3-providers-ws';
+} from '@etn-sc/web3-errors';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import WSProvider from '@etn-sc/web3-providers-ws';
 import {
 	EthExecutionAPI,
 	JsonRpcBatchRequest,
@@ -43,8 +43,8 @@ import {
 	Web3BaseProvider,
 	Web3BaseProviderConstructor,
 	JsonRpcRequest
-} from 'web3-types';
-import { isNullish, isPromise, jsonRpc, isResponseRpcError } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { isNullish, isPromise, jsonRpc, isResponseRpcError } from '@etn-sc/web3-utils';
 import {
 	isEIP1193Provider,
 	isLegacyRequestProvider,
diff --git a/packages/web3-core/src/web3_subscription_manager.ts b/packages/web3-core/src/web3_subscription_manager.ts
index 8e76498e3c2..d4bc46439dd 100644
--- a/packages/web3-core/src/web3_subscription_manager.ts
+++ b/packages/web3-core/src/web3_subscription_manager.ts
@@ -25,9 +25,9 @@ import {
 	Log,
 	Web3APISpec,
 	Web3BaseProvider,
-} from 'web3-types';
-import { ProviderError, SubscriptionError } from 'web3-errors';
-import { isNullish } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { ProviderError, SubscriptionError } from '@etn-sc/web3-errors';
+import { isNullish } from '@etn-sc/web3-utils';
 import { isSupportSubscriptions } from './utils.js';
 import { Web3RequestManager, Web3RequestManagerEvent } from './web3_request_manager.js';
 // eslint-disable-next-line import/no-cycle
diff --git a/packages/web3-core/src/web3_subscriptions.ts b/packages/web3-core/src/web3_subscriptions.ts
index 3cf4cee9f50..010ec34d3e4 100644
--- a/packages/web3-core/src/web3_subscriptions.ts
+++ b/packages/web3-core/src/web3_subscriptions.ts
@@ -28,9 +28,9 @@ import {
 	HexString,
 	Web3APIParams,
 	Web3APISpec,
-} from 'web3-types';
-import { jsonRpc } from 'web3-utils';
-import { SubscriptionError } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { jsonRpc } from '@etn-sc/web3-utils';
+import { SubscriptionError } from '@etn-sc/web3-errors';
 
 // eslint-disable-next-line import/no-cycle
 import { Web3SubscriptionManager } from './web3_subscription_manager.js';
diff --git a/packages/web3-core/test/unit/formatters.test.ts b/packages/web3-core/test/unit/formatters.test.ts
index d1aedd01d71..ee3ca79be35 100644
--- a/packages/web3-core/test/unit/formatters.test.ts
+++ b/packages/web3-core/test/unit/formatters.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import * as utils from 'web3-utils';
-import { BlockTags } from 'web3-types';
-import { Iban } from 'web3-eth-iban';
+import * as utils from '@etn-sc/web3-utils';
+import { BlockTags } from '@etn-sc/web3-types';
+import { Iban } from '@etn-sc/web3-eth-iban';
 import {
 	inputAddressFormatter,
 	inputBlockNumberFormatter,
@@ -36,8 +36,8 @@ import {
 import * as formatters from '../../src/formatters';
 
 /* eslint-disable deprecation/deprecation */
-jest.mock('web3-eth-iban');
-jest.mock('web3-utils');
+jest.mock('@etn-sc/web3-eth-iban');
+jest.mock('@etn-sc/web3-utils');
 
 describe('formatters', () => {
 	const toNumberResult = 12345;
diff --git a/packages/web3-core/test/unit/web3_batch_request.test.ts b/packages/web3-core/test/unit/web3_batch_request.test.ts
index cc861276a5f..81d4f4c3035 100644
--- a/packages/web3-core/test/unit/web3_batch_request.test.ts
+++ b/packages/web3-core/test/unit/web3_batch_request.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { JsonRpcBatchRequest, JsonRpcBatchResponse, JsonRpcOptionalRequest } from 'web3-types';
-import { jsonRpc, Web3DeferredPromise, Timeout } from 'web3-utils';
-import { OperationAbortError, OperationTimeoutError } from 'web3-errors';
+import { JsonRpcBatchRequest, JsonRpcBatchResponse, JsonRpcOptionalRequest } from '@etn-sc/web3-types';
+import { jsonRpc, Web3DeferredPromise, Timeout } from '@etn-sc/web3-utils';
+import { OperationAbortError, OperationTimeoutError } from '@etn-sc/web3-errors';
 import { Web3BatchRequest } from '../../src/web3_batch_request';
 
 describe('Web3BatchRequest', () => {
diff --git a/packages/web3-core/test/unit/web3_config.test.ts b/packages/web3-core/test/unit/web3_config.test.ts
index c5950117a03..0d88f48415d 100644
--- a/packages/web3-core/test/unit/web3_config.test.ts
+++ b/packages/web3-core/test/unit/web3_config.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { toHex } from 'web3-utils';
+import { toHex } from '@etn-sc/web3-utils';
 import { Web3Config, Web3ConfigEvent } from '../../src/web3_config';
 
 class MyConfigObject extends Web3Config {}
diff --git a/packages/web3-core/test/unit/web3_context.test.ts b/packages/web3-core/test/unit/web3_context.test.ts
index 1bedd82ba5b..75e721e71f1 100644
--- a/packages/web3-core/test/unit/web3_context.test.ts
+++ b/packages/web3-core/test/unit/web3_context.test.ts
@@ -16,8 +16,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line max-classes-per-file
-import { ExistingPluginNamespaceError } from 'web3-errors';
-import HttpProvider from 'web3-providers-http';
+import { ExistingPluginNamespaceError } from '@etn-sc/web3-errors';
+import HttpProvider from '@etn-sc/web3-providers-http';
 import { Web3Context, Web3PluginBase } from '../../src/web3_context';
 import { Web3RequestManager } from '../../src/web3_request_manager';
 
diff --git a/packages/web3-core/test/unit/web3_extend.test.ts b/packages/web3-core/test/unit/web3_extend.test.ts
index f26978fb7c3..437d5e59fdd 100644
--- a/packages/web3-core/test/unit/web3_extend.test.ts
+++ b/packages/web3-core/test/unit/web3_extend.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address, BlockTag } from 'web3-types';
+import { Address, BlockTag } from '@etn-sc/web3-types';
 import { Web3Context } from './reexported_web3_context';
 
 declare module './reexported_web3_context' {
diff --git a/packages/web3-core/test/unit/web3_request_manager.test.ts b/packages/web3-core/test/unit/web3_request_manager.test.ts
index bbd6dec6698..980acd0413f 100644
--- a/packages/web3-core/test/unit/web3_request_manager.test.ts
+++ b/packages/web3-core/test/unit/web3_request_manager.test.ts
@@ -23,8 +23,8 @@ import {
 	JsonRpcResponseWithError,
 	JsonRpcResponseWithResult,
 	JsonRpcIdentifier,
-} from 'web3-types';
-import { jsonRpc } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { jsonRpc } from '@etn-sc/web3-utils';
 import {
 	InvalidResponseError,
 	ParseError,
@@ -41,9 +41,9 @@ import {
 	RpcError,
 	ResourceUnavailableError,
 	ResponseError,
-} from 'web3-errors';
-import HttpProvider from 'web3-providers-http';
-import WSProvider from 'web3-providers-ws';
+} from '@etn-sc/web3-errors';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import WSProvider from '@etn-sc/web3-providers-ws';
 import { Web3RequestManager, Web3RequestManagerEvent } from '../../src/web3_request_manager';
 import * as utils from '../../src/utils';
 
diff --git a/packages/web3-core/test/unit/web3_subscription_manager.test.ts b/packages/web3-core/test/unit/web3_subscription_manager.test.ts
index 403719b292a..c4bd385c951 100644
--- a/packages/web3-core/test/unit/web3_subscription_manager.test.ts
+++ b/packages/web3-core/test/unit/web3_subscription_manager.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
 import { Web3RequestManagerEvent } from '../../src/web3_request_manager';
 import { Web3SubscriptionManager } from '../../src/web3_subscription_manager';
 import { ExampleSubscription } from './fixtures/example_subscription';
diff --git a/packages/web3-errors/README.md b/packages/web3-errors/README.md
index 9a68b9a7b8d..5037ad732ef 100644
--- a/packages/web3-errors/README.md
+++ b/packages/web3-errors/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-errors` This package has web3 error classes.
+`@etn-sc/web3-errors` This package has web3 error classes.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-errors) or using [Yarn](https://yarnpkg.com/package/web3-errors)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-errors)
 
 ### Using NPM
 
 ```bash
-npm install web3-errors
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-errors
+npm install @etn-sc/web3-errors
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-errors
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-errors
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-errors
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-errors%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-errors
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-errors
 [downloads-image]: https://img.shields.io/npm/dm/web3-errors?label=npm%20downloads
diff --git a/packages/web3-errors/package.json b/packages/web3-errors/package.json
index fd43a758229..e37dce2ef69 100644
--- a/packages/web3-errors/package.json
+++ b/packages/web3-errors/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-errors",
+	"name": "@etn-sc/web3-errors",
 	"version": "1.1.4",
 	"description": "This package has web3 error classes",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -41,7 +41,7 @@
 		"test:integration": "jest --config=./test/integration/jest.config.js --passWithNoTests"
 	},
 	"dependencies": {
-		"web3-types": "^1.3.1"
+		"@etn-sc/web3-types": "^1.3.1"
 	},
 	"devDependencies": {
 		"@types/jest": "^28.1.6",
diff --git a/packages/web3-errors/src/errors/connection_errors.ts b/packages/web3-errors/src/errors/connection_errors.ts
index d9d820898b0..7daf10c2665 100644
--- a/packages/web3-errors/src/errors/connection_errors.ts
+++ b/packages/web3-errors/src/errors/connection_errors.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable max-classes-per-file */
 
-import { ConnectionEvent } from 'web3-types';
+import { ConnectionEvent } from '@etn-sc/web3-types';
 import {
 	ERR_CONN,
 	ERR_CONN_INVALID,
diff --git a/packages/web3-errors/src/errors/contract_errors.ts b/packages/web3-errors/src/errors/contract_errors.ts
index 98a38245da6..04fea7b2713 100644
--- a/packages/web3-errors/src/errors/contract_errors.ts
+++ b/packages/web3-errors/src/errors/contract_errors.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable max-classes-per-file */
 
-import { JsonRpcError, TransactionReceipt, HexString } from 'web3-types';
+import { JsonRpcError, TransactionReceipt, HexString } from '@etn-sc/web3-types';
 import {
 	ERR_CONTRACT,
 	ERR_CONTRACT_ABI_MISSING,
diff --git a/packages/web3-errors/src/errors/response_errors.ts b/packages/web3-errors/src/errors/response_errors.ts
index 95d08b91ad6..8c1e17c7018 100644
--- a/packages/web3-errors/src/errors/response_errors.ts
+++ b/packages/web3-errors/src/errors/response_errors.ts
@@ -21,7 +21,7 @@ import {
 	JsonRpcPayload,
 	JsonRpcResponse,
 	JsonRpcResponseWithError,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { BaseWeb3Error } from '../web3_error_base.js';
 import { ERR_INVALID_RESPONSE, ERR_RESPONSE } from '../error_codes.js';
 
diff --git a/packages/web3-errors/src/errors/rpc_errors.ts b/packages/web3-errors/src/errors/rpc_errors.ts
index d7f7e899e59..dd73c35f811 100644
--- a/packages/web3-errors/src/errors/rpc_errors.ts
+++ b/packages/web3-errors/src/errors/rpc_errors.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable max-classes-per-file */
 
-import { JsonRpcResponseWithError, JsonRpcId, JsonRpcError } from 'web3-types';
+import { JsonRpcResponseWithError, JsonRpcId, JsonRpcError } from '@etn-sc/web3-types';
 import { BaseWeb3Error } from '../web3_error_base.js';
 import {
 	ERR_RPC_INTERNAL_ERROR,
diff --git a/packages/web3-errors/src/errors/transaction_errors.ts b/packages/web3-errors/src/errors/transaction_errors.ts
index 69c56378724..3886e62911c 100644
--- a/packages/web3-errors/src/errors/transaction_errors.ts
+++ b/packages/web3-errors/src/errors/transaction_errors.ts
@@ -23,7 +23,7 @@ import {
 	Numbers,
 	TransactionReceipt,
 	Web3ValidationErrorObject,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import {
 	ERR_RAW_TX_UNDEFINED,
 	ERR_TX,
diff --git a/packages/web3-errors/src/web3_error_base.ts b/packages/web3-errors/src/web3_error_base.ts
index 72a6fd01731..b141d23bf44 100644
--- a/packages/web3-errors/src/web3_error_base.ts
+++ b/packages/web3-errors/src/web3_error_base.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable max-classes-per-file */
 
-import { Web3Error } from 'web3-types';
+import { Web3Error } from '@etn-sc/web3-types';
 
 export abstract class BaseWeb3Error extends Error implements Web3Error {
 	public readonly name: string;
diff --git a/packages/web3-errors/test/unit/errors.test.ts b/packages/web3-errors/test/unit/errors.test.ts
index 7428cc9b6b3..d6711c9f09b 100644
--- a/packages/web3-errors/test/unit/errors.test.ts
+++ b/packages/web3-errors/test/unit/errors.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { JsonRpcError } from 'web3-types';
+import { JsonRpcError } from '@etn-sc/web3-types';
 import * as accountErrors from '../../src/errors/account_errors';
 import * as connectionErrors from '../../src/errors/connection_errors';
 import * as contractErrors from '../../src/errors/contract_errors';
diff --git a/packages/web3-errors/test/unit/rpc-errors.test.ts b/packages/web3-errors/test/unit/rpc-errors.test.ts
index 584b9397216..f4d12318c55 100644
--- a/packages/web3-errors/test/unit/rpc-errors.test.ts
+++ b/packages/web3-errors/test/unit/rpc-errors.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { JsonRpcIdentifier } from 'web3-types';
+import { JsonRpcIdentifier } from '@etn-sc/web3-types';
 
 import * as rpcErrors from '../../src/errors/rpc_errors';
 import { RpcErrorMessages } from '../../src/errors/rpc_error_messages';
diff --git a/packages/web3-eth-abi/README.md b/packages/web3-eth-abi/README.md
index bbeb96bf2c4..03f0fab68ed 100644
--- a/packages/web3-eth-abi/README.md
+++ b/packages/web3-eth-abi/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth-abi` contains functions for the encode and decode EVM in/output.
+`@etn-sc/web3-eth-abi` contains functions for the encode and decode EVM in/output.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-abi) or using [Yarn](https://yarnpkg.com/package/web3-eth-abi)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-abi)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-abi
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-abi
+npm install @etn-sc/web3-eth-abi
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth-abi
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-abi
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-abi
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-abi%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-abi
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-abi
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-abi?label=npm%20downloads
diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json
index c685639c1ac..4169d620e82 100644
--- a/packages/web3-eth-abi/package.json
+++ b/packages/web3-eth-abi/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-eth-abi",
+	"name": "@etn-sc/web3-eth-abi",
 	"version": "4.1.4",
 	"description": "Web3 module encode and decode EVM in/output.",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ethereum/web3.js/tree/4.x/packages/web3-eth-abi",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-abi",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -43,10 +43,10 @@
 	},
 	"dependencies": {
 		"abitype": "0.7.1",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	},
 	"devDependencies": {
 		"@humeris/espresso-shot": "^4.0.0",
diff --git a/packages/web3-eth-abi/src/api/errors_api.ts b/packages/web3-eth-abi/src/api/errors_api.ts
index 7a6a2bc85ff..42cce8498d4 100644
--- a/packages/web3-eth-abi/src/api/errors_api.ts
+++ b/packages/web3-eth-abi/src/api/errors_api.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { sha3Raw } from 'web3-utils';
-import { AbiError } from 'web3-errors';
-import { AbiErrorFragment } from 'web3-types';
+import { sha3Raw } from '@etn-sc/web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiErrorFragment } from '@etn-sc/web3-types';
 import { jsonInterfaceMethodToString, isAbiErrorFragment } from '../utils.js';
 
 /**
diff --git a/packages/web3-eth-abi/src/api/events_api.ts b/packages/web3-eth-abi/src/api/events_api.ts
index 92b38b4afb9..387b6f6ae6b 100644
--- a/packages/web3-eth-abi/src/api/events_api.ts
+++ b/packages/web3-eth-abi/src/api/events_api.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { sha3Raw } from 'web3-utils';
-import { AbiError } from 'web3-errors';
-import { AbiEventFragment } from 'web3-types';
+import { sha3Raw } from '@etn-sc/web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiEventFragment } from '@etn-sc/web3-types';
 import { jsonInterfaceMethodToString, isAbiEventFragment } from '../utils.js';
 
 /**
diff --git a/packages/web3-eth-abi/src/api/functions_api.ts b/packages/web3-eth-abi/src/api/functions_api.ts
index 0c78c4f5a1f..5affa258bfb 100644
--- a/packages/web3-eth-abi/src/api/functions_api.ts
+++ b/packages/web3-eth-abi/src/api/functions_api.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { sha3Raw } from 'web3-utils';
-import { AbiFunctionFragment } from 'web3-types';
+import { AbiError } from '@etn-sc/web3-errors';
+import { sha3Raw } from '@etn-sc/web3-utils';
+import { AbiFunctionFragment } from '@etn-sc/web3-types';
 import { isAbiFunctionFragment, jsonInterfaceMethodToString } from '../utils.js';
 import { encodeParameters } from './parameters_api.js';
 
diff --git a/packages/web3-eth-abi/src/api/logs_api.ts b/packages/web3-eth-abi/src/api/logs_api.ts
index 677a4c50478..48c210b5f31 100644
--- a/packages/web3-eth-abi/src/api/logs_api.ts
+++ b/packages/web3-eth-abi/src/api/logs_api.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { HexString, AbiParameter, DecodedParams } from 'web3-types';
+import { HexString, AbiParameter, DecodedParams } from '@etn-sc/web3-types';
 import { decodeParameter, decodeParametersWith } from './parameters_api.js';
 
 const STATIC_TYPES = ['bool', 'string', 'int', 'uint', 'address', 'fixed', 'ufixed'];
diff --git a/packages/web3-eth-abi/src/api/parameters_api.ts b/packages/web3-eth-abi/src/api/parameters_api.ts
index 98624b20daa..525bc3a98fe 100644
--- a/packages/web3-eth-abi/src/api/parameters_api.ts
+++ b/packages/web3-eth-abi/src/api/parameters_api.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiInput, HexString } from 'web3-types';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiInput, HexString } from '@etn-sc/web3-types';
 import { decodeParameters as decodeParametersInternal } from '../coders/decode.js';
 import { encodeParameters as encodeParametersInternal } from '../coders/encode.js';
 
diff --git a/packages/web3-eth-abi/src/coders/base/address.ts b/packages/web3-eth-abi/src/coders/base/address.ts
index ae63744ebe3..bb6a86e0fce 100644
--- a/packages/web3-eth-abi/src/coders/base/address.ts
+++ b/packages/web3-eth-abi/src/coders/base/address.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiParameter } from 'web3-types';
-import { toChecksumAddress } from 'web3-utils';
-import { isAddress, utils } from 'web3-validator';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiParameter } from '@etn-sc/web3-types';
+import { toChecksumAddress } from '@etn-sc/web3-utils';
+import { isAddress, utils } from '@etn-sc/web3-validator';
 import { DecoderResult, EncoderResult } from '../types.js';
 import { alloc, WORD_SIZE } from '../utils.js';
 
diff --git a/packages/web3-eth-abi/src/coders/base/array.ts b/packages/web3-eth-abi/src/coders/base/array.ts
index 0c23ac4e287..d57af16d033 100644
--- a/packages/web3-eth-abi/src/coders/base/array.ts
+++ b/packages/web3-eth-abi/src/coders/base/array.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiParameter } from 'web3-types';
-import { uint8ArrayConcat } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiParameter } from '@etn-sc/web3-types';
+import { uint8ArrayConcat } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-cycle
 import { decodeParamFromAbiParameter, encodeNumber, encodeParamFromAbiParameter } from './index.js';
 import { DecoderResult, EncoderResult } from '../types.js';
diff --git a/packages/web3-eth-abi/src/coders/base/bool.ts b/packages/web3-eth-abi/src/coders/base/bool.ts
index af0b95dcfe7..fd2235c1a6d 100644
--- a/packages/web3-eth-abi/src/coders/base/bool.ts
+++ b/packages/web3-eth-abi/src/coders/base/bool.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError, InvalidBooleanError } from 'web3-errors';
-import { AbiParameter } from 'web3-types';
-import { toBool } from 'web3-utils';
+import { AbiError, InvalidBooleanError } from '@etn-sc/web3-errors';
+import { AbiParameter } from '@etn-sc/web3-types';
+import { toBool } from '@etn-sc/web3-utils';
 import { DecoderResult, EncoderResult } from '../types.js';
 import { WORD_SIZE } from '../utils.js';
 import { decodeNumber, encodeNumber } from './number.js';
diff --git a/packages/web3-eth-abi/src/coders/base/bytes.ts b/packages/web3-eth-abi/src/coders/base/bytes.ts
index 714abbfdbd2..8d514a99e5c 100644
--- a/packages/web3-eth-abi/src/coders/base/bytes.ts
+++ b/packages/web3-eth-abi/src/coders/base/bytes.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiParameter, Bytes } from 'web3-types';
-import { bytesToHex, bytesToUint8Array } from 'web3-utils';
-import { isBytes, ValidInputTypes } from 'web3-validator';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiParameter, Bytes } from '@etn-sc/web3-types';
+import { bytesToHex, bytesToUint8Array } from '@etn-sc/web3-utils';
+import { isBytes, ValidInputTypes } from '@etn-sc/web3-validator';
 import { DecoderResult, EncoderResult } from '../types.js';
 import { alloc, WORD_SIZE } from '../utils.js';
 import { decodeNumber, encodeNumber } from './number.js';
diff --git a/packages/web3-eth-abi/src/coders/base/index.ts b/packages/web3-eth-abi/src/coders/base/index.ts
index 007d31e98a4..c49a6aa4fa0 100644
--- a/packages/web3-eth-abi/src/coders/base/index.ts
+++ b/packages/web3-eth-abi/src/coders/base/index.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter } from 'web3-types';
+import { AbiParameter } from '@etn-sc/web3-types';
 import { EncoderResult, DecoderResult } from '../types.js';
 import { decodeAddress, encodeAddress } from './address.js';
 import { decodeBool, encodeBoolean } from './bool.js';
diff --git a/packages/web3-eth-abi/src/coders/base/number.ts b/packages/web3-eth-abi/src/coders/base/number.ts
index a86ee4f6acd..6dd90531523 100644
--- a/packages/web3-eth-abi/src/coders/base/number.ts
+++ b/packages/web3-eth-abi/src/coders/base/number.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import type { AbiParameter } from 'web3-types';
-import { padLeft, toBigInt } from 'web3-utils';
-import { utils } from 'web3-validator';
+import { AbiError } from '@etn-sc/web3-errors';
+import type { AbiParameter } from '@etn-sc/web3-types';
+import { padLeft, toBigInt } from '@etn-sc/web3-utils';
+import { utils } from '@etn-sc/web3-validator';
 import { DecoderResult, EncoderResult } from '../types.js';
 import { WORD_SIZE } from '../utils.js';
 import { numberLimits } from './numbersLimits.js';
diff --git a/packages/web3-eth-abi/src/coders/base/string.ts b/packages/web3-eth-abi/src/coders/base/string.ts
index 6ad69e23ef3..976e663fcac 100644
--- a/packages/web3-eth-abi/src/coders/base/string.ts
+++ b/packages/web3-eth-abi/src/coders/base/string.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiParameter } from 'web3-types';
-import { hexToUtf8, utf8ToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiParameter } from '@etn-sc/web3-types';
+import { hexToUtf8, utf8ToBytes } from '@etn-sc/web3-utils';
 import { DecoderResult, EncoderResult } from '../types.js';
 import { decodeBytes, encodeBytes } from './bytes.js';
 
diff --git a/packages/web3-eth-abi/src/coders/base/tuple.ts b/packages/web3-eth-abi/src/coders/base/tuple.ts
index 89ccff48cf3..2eef1bb3d7a 100644
--- a/packages/web3-eth-abi/src/coders/base/tuple.ts
+++ b/packages/web3-eth-abi/src/coders/base/tuple.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiParameter } from 'web3-types';
-import { uint8ArrayConcat } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiParameter } from '@etn-sc/web3-types';
+import { uint8ArrayConcat } from '@etn-sc/web3-utils';
 import { DecoderResult, EncoderResult } from '../types.js';
 // eslint-disable-next-line import/no-cycle
 import { decodeParamFromAbiParameter, encodeParamFromAbiParameter } from './index.js';
diff --git a/packages/web3-eth-abi/src/coders/base/utils.ts b/packages/web3-eth-abi/src/coders/base/utils.ts
index 65a7f46aaf5..59a3b9f2a63 100644
--- a/packages/web3-eth-abi/src/coders/base/utils.ts
+++ b/packages/web3-eth-abi/src/coders/base/utils.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { uint8ArrayConcat } from 'web3-utils';
+import { uint8ArrayConcat } from '@etn-sc/web3-utils';
 import { EncoderResult } from '../types.js';
 import { WORD_SIZE } from '../utils.js';
 import { encodeNumber } from './number.js';
diff --git a/packages/web3-eth-abi/src/coders/decode.ts b/packages/web3-eth-abi/src/coders/decode.ts
index adc84ad93bb..e500d61ac5e 100644
--- a/packages/web3-eth-abi/src/coders/decode.ts
+++ b/packages/web3-eth-abi/src/coders/decode.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiInput, HexString } from 'web3-types';
-import { utils } from 'web3-validator';
+import { AbiInput, HexString } from '@etn-sc/web3-types';
+import { utils } from '@etn-sc/web3-validator';
 import { decodeTuple } from './base/tuple.js';
 import { toAbiParams } from './utils.js';
 
diff --git a/packages/web3-eth-abi/src/coders/encode.ts b/packages/web3-eth-abi/src/coders/encode.ts
index d0d8260db16..8097a4671c5 100644
--- a/packages/web3-eth-abi/src/coders/encode.ts
+++ b/packages/web3-eth-abi/src/coders/encode.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiError } from 'web3-errors';
-import { AbiInput } from 'web3-types';
-import { utils } from 'web3-validator';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiInput } from '@etn-sc/web3-types';
+import { utils } from '@etn-sc/web3-validator';
 import { encodeTuple } from './base/index.js';
 import { toAbiParams } from './utils.js';
 
diff --git a/packages/web3-eth-abi/src/coders/utils.ts b/packages/web3-eth-abi/src/coders/utils.ts
index 82b557262a8..47bca6323c6 100644
--- a/packages/web3-eth-abi/src/coders/utils.ts
+++ b/packages/web3-eth-abi/src/coders/utils.ts
@@ -16,9 +16,9 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { AbiParameter as ExternalAbiParameter, parseAbiParameter } from 'abitype';
-import { AbiError } from 'web3-errors';
-import { AbiInput, AbiParameter, AbiStruct } from 'web3-types';
-import { isNullish } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { AbiInput, AbiParameter, AbiStruct } from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-utils';
 import {
 	isSimplifiedStructFormat,
 	mapStructNameAndType,
diff --git a/packages/web3-eth-abi/src/decode_contract_error_data.ts b/packages/web3-eth-abi/src/decode_contract_error_data.ts
index 98eb02d4fd8..4bc5cad0668 100644
--- a/packages/web3-eth-abi/src/decode_contract_error_data.ts
+++ b/packages/web3-eth-abi/src/decode_contract_error_data.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Eip838ExecutionError } from 'web3-errors';
-import { AbiErrorFragment } from 'web3-types';
+import { Eip838ExecutionError } from '@etn-sc/web3-errors';
+import { AbiErrorFragment } from '@etn-sc/web3-types';
 
 import { encodeErrorSignature } from './api/errors_api.js';
 import { decodeParameters } from './api/parameters_api.js';
diff --git a/packages/web3-eth-abi/src/eip_712.ts b/packages/web3-eth-abi/src/eip_712.ts
index f08609bffc5..3f26078a4aa 100644
--- a/packages/web3-eth-abi/src/eip_712.ts
+++ b/packages/web3-eth-abi/src/eip_712.ts
@@ -19,8 +19,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  * @note This code was taken from: https://github.com/Mrtenz/eip-712/tree/master
  */
 
-import { Eip712TypedData } from 'web3-types';
-import { isNullish, keccak256 } from 'web3-utils';
+import { Eip712TypedData } from '@etn-sc/web3-types';
+import { isNullish, keccak256 } from '@etn-sc/web3-utils';
 import { encodeParameters } from './coders/encode.js';
 
 const TYPE_REGEX = /^\w+/;
diff --git a/packages/web3-eth-abi/src/utils.ts b/packages/web3-eth-abi/src/utils.ts
index e8212c28329..f3c3b97443b 100644
--- a/packages/web3-eth-abi/src/utils.ts
+++ b/packages/web3-eth-abi/src/utils.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { isNullish, leftPad, rightPad, toHex } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { isNullish, leftPad, rightPad, toHex } from '@etn-sc/web3-utils';
 import {
 	AbiInput,
 	AbiCoderStruct,
@@ -26,7 +26,7 @@ import {
 	AbiEventFragment,
 	AbiFunctionFragment,
 	AbiConstructorFragment,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 export const isAbiFragment = (item: unknown): item is AbiFragment =>
 	!isNullish(item) &&
diff --git a/packages/web3-eth-abi/test/fixtures/coders/base/bytes.ts b/packages/web3-eth-abi/test/fixtures/coders/base/bytes.ts
index 3886f0c8cf8..6466da600b1 100644
--- a/packages/web3-eth-abi/test/fixtures/coders/base/bytes.ts
+++ b/packages/web3-eth-abi/test/fixtures/coders/base/bytes.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter } from 'web3-types';
+import { AbiParameter } from '@etn-sc/web3-types';
 
 export const validBytesEncoderData: [AbiParameter, string, string][] = [
 	[
diff --git a/packages/web3-eth-abi/test/fixtures/coders/base/number.ts b/packages/web3-eth-abi/test/fixtures/coders/base/number.ts
index 932e6d27551..ce26d8d1959 100644
--- a/packages/web3-eth-abi/test/fixtures/coders/base/number.ts
+++ b/packages/web3-eth-abi/test/fixtures/coders/base/number.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter, Numbers } from 'web3-types';
+import { AbiParameter, Numbers } from '@etn-sc/web3-types';
 
 export const validNumberEncoderData: [AbiParameter, Numbers, string][] = [
 	[
diff --git a/packages/web3-eth-abi/test/fixtures/coders/base/tuple.ts b/packages/web3-eth-abi/test/fixtures/coders/base/tuple.ts
index fdccee223ba..5700379b01d 100644
--- a/packages/web3-eth-abi/test/fixtures/coders/base/tuple.ts
+++ b/packages/web3-eth-abi/test/fixtures/coders/base/tuple.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter } from 'web3-types';
+import { AbiParameter } from '@etn-sc/web3-types';
 
 export const validEncoderData: Array<{
 	components: ReadonlyArray<AbiParameter>;
diff --git a/packages/web3-eth-abi/test/fixtures/coders/encode.ts b/packages/web3-eth-abi/test/fixtures/coders/encode.ts
index 9fa67ac65da..a3bb41c804d 100644
--- a/packages/web3-eth-abi/test/fixtures/coders/encode.ts
+++ b/packages/web3-eth-abi/test/fixtures/coders/encode.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiInput } from 'web3-types';
+import { AbiInput } from '@etn-sc/web3-types';
 
 /*
 This file is part of web3.js.
diff --git a/packages/web3-eth-abi/test/fixtures/get_encoded_eip712_data.ts b/packages/web3-eth-abi/test/fixtures/get_encoded_eip712_data.ts
index ff7474aa33f..61b11513af9 100644
--- a/packages/web3-eth-abi/test/fixtures/get_encoded_eip712_data.ts
+++ b/packages/web3-eth-abi/test/fixtures/get_encoded_eip712_data.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Eip712TypedData } from 'web3-types';
+import { Eip712TypedData } from '@etn-sc/web3-types';
 
 /**
  * string is the test title
diff --git a/packages/web3-eth-abi/test/unit/api/parameters_api.test.ts b/packages/web3-eth-abi/test/unit/api/parameters_api.test.ts
index ae006ab0aee..41e216e7326 100644
--- a/packages/web3-eth-abi/test/unit/api/parameters_api.test.ts
+++ b/packages/web3-eth-abi/test/unit/api/parameters_api.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiInput } from 'web3-types';
+import { AbiInput } from '@etn-sc/web3-types';
 import { decodeParameters, encodeParameters } from '../../../src/api/parameters_api';
 import {
 	inValidDecodeParametersData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/address.test.ts b/packages/web3-eth-abi/test/unit/coders/base/address.test.ts
index 38c6096ca8e..fd81aeab472 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/address.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/address.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { bytesToHex, hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { bytesToHex, hexToBytes } from '@etn-sc/web3-utils';
 import { decodeAddress, encodeAddress } from '../../../../src/coders/base/address';
 import {
 	invalidAddressDecoderData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/array.test.ts b/packages/web3-eth-abi/test/unit/coders/base/array.test.ts
index e0716e44838..9f5f1329773 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/array.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/array.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { bytesToHex, hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { bytesToHex, hexToBytes } from '@etn-sc/web3-utils';
 import { decodeArray, encodeArray } from '../../../../src/coders/base';
 import { extractArrayType } from '../../../../src/coders/utils';
 import {
diff --git a/packages/web3-eth-abi/test/unit/coders/base/bool.test.ts b/packages/web3-eth-abi/test/unit/coders/base/bool.test.ts
index 755eb097c24..a06b28a62c5 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/bool.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/bool.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { bytesToHex, hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { bytesToHex, hexToBytes } from '@etn-sc/web3-utils';
 import { decodeBool, encodeBoolean } from '../../../../src/coders/base/bool';
 import {
 	invalidBoolDecoderData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/bytes.test.ts b/packages/web3-eth-abi/test/unit/coders/base/bytes.test.ts
index d9e1bdde496..269e6d3c007 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/bytes.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/bytes.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { decodeBytes, encodeBytes } from '../../../../src/coders/base/bytes';
 import {
 	invalidBytesDecoderData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/number.test.ts b/packages/web3-eth-abi/test/unit/coders/base/number.test.ts
index 914e106e5f4..cd524cb5aa2 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/number.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/number.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { decodeNumber, encodeNumber } from '../../../../src/coders/base/number';
 import {
 	invalidNumberDecoderData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/string.test.ts b/packages/web3-eth-abi/test/unit/coders/base/string.test.ts
index 22aa0f78844..880c74fecf6 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/string.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/string.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiError } from 'web3-errors';
-import { hexToBytes } from 'web3-utils';
+import { AbiError } from '@etn-sc/web3-errors';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { decodeString, encodeString } from '../../../../src/coders/base/string';
 import {
 	invalidStringEncoderData,
diff --git a/packages/web3-eth-abi/test/unit/coders/base/tuple.test.ts b/packages/web3-eth-abi/test/unit/coders/base/tuple.test.ts
index a59c5d71204..b9fd7317dbd 100644
--- a/packages/web3-eth-abi/test/unit/coders/base/tuple.test.ts
+++ b/packages/web3-eth-abi/test/unit/coders/base/tuple.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { decodeTuple, encodeTuple } from '../../../../src/coders/base/tuple';
 import { validDecoderData, validEncoderData } from '../../../fixtures/coders/base/tuple';
 
diff --git a/packages/web3-eth-abi/test/unit/decodeContractErrorData.test.ts b/packages/web3-eth-abi/test/unit/decodeContractErrorData.test.ts
index c130af64c4a..0ef12da971f 100644
--- a/packages/web3-eth-abi/test/unit/decodeContractErrorData.test.ts
+++ b/packages/web3-eth-abi/test/unit/decodeContractErrorData.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Eip838ExecutionError } from 'web3-errors';
+import { Eip838ExecutionError } from '@etn-sc/web3-errors';
 import { decodeContractErrorData } from '../../src/decode_contract_error_data';
 
 import { validDecodeContractErrorData, invalidDecodeContractErrorData } from '../fixtures/data';
diff --git a/packages/web3-eth-abi/test/unit/encodeDecodeParams.test.ts b/packages/web3-eth-abi/test/unit/encodeDecodeParams.test.ts
index 63916a598ab..c3b8a7bcb71 100644
--- a/packages/web3-eth-abi/test/unit/encodeDecodeParams.test.ts
+++ b/packages/web3-eth-abi/test/unit/encodeDecodeParams.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiInput } from 'web3-types';
+import { AbiInput } from '@etn-sc/web3-types';
 import { decodeParameters, encodeParameters } from '../../src';
 import testsData from '../fixtures/abitestsdata.json';
 import { deepEqualTolerateBigInt, removeKey } from './test_utils';
diff --git a/packages/web3-eth-abi/test/unit/types.test.ts b/packages/web3-eth-abi/test/unit/types.test.ts
index 7bcd3921258..95d0a7be020 100644
--- a/packages/web3-eth-abi/test/unit/types.test.ts
+++ b/packages/web3-eth-abi/test/unit/types.test.ts
@@ -21,7 +21,7 @@ import {
 	Bytes,
 	MatchPrimitiveType,
 	Numbers,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { expectTypeOf, typecheck } from '@humeris/espresso-shot';
 
 describe('types', () => {
diff --git a/packages/web3-eth-accounts/README.md b/packages/web3-eth-accounts/README.md
index 3ca18c2a460..fffea4779df 100644
--- a/packages/web3-eth-accounts/README.md
+++ b/packages/web3-eth-accounts/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/electroneum-web3.js][repo].
 
-`web3-eth-accounts` contains functionality for managing Ethereum accounts and signing.
+`@etn-sc/web3-eth-accounts` contains functionality for managing Electroneum Smart Chain accounts and signing.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-accounts) or using [Yarn](https://yarnpkg.com/package/web3-eth-accounts)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-accounts)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-accounts
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-accounts
+npm install @etn-sc/web3-eth-accounts
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth-accounts
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-accounts
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-accounts
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-accounts%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-accounts
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-accounts
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-accounts?label=npm%20downloads
diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json
index ae62345610d..a604efce37c 100644
--- a/packages/web3-eth-accounts/package.json
+++ b/packages/web3-eth-accounts/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth-accounts",
-	"version": "4.1.0",
-	"description": "Package for managing Ethereum accounts and signing",
+	"name": "@etn-sc/web3-eth-accounts",
+	"version": "4.1.2",
+	"description": "Package for managing Electroneum accounts and signing",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -55,15 +55,15 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3-providers-ipc": "^4.0.7"
+		"@etn-sc/web3-providers-ipc": "^4.0.7"
 	},
 	"dependencies": {
 		"@ethereumjs/rlp": "^4.0.1",
 		"crc-32": "^1.2.2",
 		"ethereum-cryptography": "^2.0.0",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-eth-accounts/src/account.ts b/packages/web3-eth-accounts/src/account.ts
index adedda2ba21..e3329237ee3 100644
--- a/packages/web3-eth-accounts/src/account.ts
+++ b/packages/web3-eth-accounts/src/account.ts
@@ -33,7 +33,7 @@ import {
 	PrivateKeyLengthError,
 	TransactionSigningError,
 	UndefinedRawTransactionError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import {
 	Address,
 	Bytes,
@@ -43,7 +43,7 @@ import {
 	PBKDF2SHA256Params,
 	ScryptParams,
 	Transaction,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import {
 	bytesToUint8Array,
 	bytesToHex,
@@ -56,9 +56,9 @@ import {
 	uint8ArrayConcat,
 	utf8ToHex,
 	uuidV4,
-} from 'web3-utils';
+} from '@etn-sc/web3-utils';
 
-import { isHexStrict, isNullish, isString, validator } from 'web3-validator';
+import { isHexStrict, isNullish, isString, validator } from '@etn-sc/web3-validator';
 import { secp256k1 } from './tx/constants.js';
 import { keyStoreSchema } from './schemas.js';
 import { TransactionFactory } from './tx/transactionFactory.js';
diff --git a/packages/web3-eth-accounts/src/common/common.ts b/packages/web3-eth-accounts/src/common/common.ts
index e941338763a..7348364080f 100644
--- a/packages/web3-eth-accounts/src/common/common.ts
+++ b/packages/web3-eth-accounts/src/common/common.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import pkg from 'crc-32';
-import { EventEmitter, bytesToHex, hexToBytes, uint8ArrayConcat } from 'web3-utils';
-import type { Numbers } from 'web3-types';
+import { EventEmitter, bytesToHex, hexToBytes, uint8ArrayConcat } from '@etn-sc/web3-utils';
+import type { Numbers } from '@etn-sc/web3-types';
 import { TypeOutput } from './types.js';
 import { intToUint8Array, toType, parseGethGenesis } from './utils.js';
 import goerli from './chains/goerli.js';
diff --git a/packages/web3-eth-accounts/src/common/utils.ts b/packages/web3-eth-accounts/src/common/utils.ts
index f243ede269d..88c29b9096e 100644
--- a/packages/web3-eth-accounts/src/common/utils.ts
+++ b/packages/web3-eth-accounts/src/common/utils.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isHexPrefixed, isHexString } from 'web3-validator';
-import { bytesToHex, hexToBytes, numberToHex } from 'web3-utils';
+import { isHexPrefixed, isHexString } from '@etn-sc/web3-validator';
+import { bytesToHex, hexToBytes, numberToHex } from '@etn-sc/web3-utils';
 import { secp256k1 } from '../tx/constants.js';
 import { Hardfork } from './enums.js';
 import { ToBytesInputTypes, TypeOutput, TypeOutputReturnType } from './types.js';
diff --git a/packages/web3-eth-accounts/src/index.ts b/packages/web3-eth-accounts/src/index.ts
index 3d128c65de4..8865f61b937 100644
--- a/packages/web3-eth-accounts/src/index.ts
+++ b/packages/web3-eth-accounts/src/index.ts
@@ -23,13 +23,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  *
  * To use this package standalone and use its methods use:
  * ```ts
- * import { create, decrypt } from 'web3-eth-accounts'; // ....
+ * import { create, decrypt } from '@etn-sc/web3-eth-accounts'; // ....
  * ```
  *
  * To use this package within the web3 object use:
  *
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  *
  * const web3 = new Web3(Web3.givenProvider || 'ws://some.local-or-remote.node:8546');
  * // now you have access to the accounts class
diff --git a/packages/web3-eth-accounts/src/tx/address.ts b/packages/web3-eth-accounts/src/tx/address.ts
index 7d6f1ace322..3ddfab03db8 100644
--- a/packages/web3-eth-accounts/src/tx/address.ts
+++ b/packages/web3-eth-accounts/src/tx/address.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
-import { bytesToHex, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import { secp256k1 } from './constants.js';
 import { assertIsUint8Array, zeros } from '../common/utils.js';
 
diff --git a/packages/web3-eth-accounts/src/tx/baseTransaction.ts b/packages/web3-eth-accounts/src/tx/baseTransaction.ts
index 1277a7f3c50..ec543ebd855 100644
--- a/packages/web3-eth-accounts/src/tx/baseTransaction.ts
+++ b/packages/web3-eth-accounts/src/tx/baseTransaction.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Numbers } from 'web3-types';
-import { bytesToHex } from 'web3-utils';
+import { Numbers } from '@etn-sc/web3-types';
+import { bytesToHex } from '@etn-sc/web3-utils';
 import { MAX_INTEGER, MAX_UINT64, SECP256K1_ORDER_DIV_2, secp256k1 } from './constants.js';
 import { toUint8Array, uint8ArrayToBigInt, unpadUint8Array } from '../common/utils.js';
 import { Common } from '../common/common.js';
diff --git a/packages/web3-eth-accounts/src/tx/eip1559Transaction.ts b/packages/web3-eth-accounts/src/tx/eip1559Transaction.ts
index eafb889220a..9c4fe5bca9f 100644
--- a/packages/web3-eth-accounts/src/tx/eip1559Transaction.ts
+++ b/packages/web3-eth-accounts/src/tx/eip1559Transaction.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
-import { validateNoLeadingZeroes } from 'web3-validator';
+import { validateNoLeadingZeroes } from '@etn-sc/web3-validator';
 import { RLP } from '@ethereumjs/rlp';
-import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import { MAX_INTEGER } from './constants.js';
 import { BaseTransaction } from './baseTransaction.js';
 import {
diff --git a/packages/web3-eth-accounts/src/tx/eip2930Transaction.ts b/packages/web3-eth-accounts/src/tx/eip2930Transaction.ts
index 7152fbee58d..e9a6c35863e 100644
--- a/packages/web3-eth-accounts/src/tx/eip2930Transaction.ts
+++ b/packages/web3-eth-accounts/src/tx/eip2930Transaction.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
-import { validateNoLeadingZeroes } from 'web3-validator';
+import { validateNoLeadingZeroes } from '@etn-sc/web3-validator';
 import { RLP } from '@ethereumjs/rlp';
-import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import { MAX_INTEGER } from './constants.js';
 import {
 	getAccessListData,
diff --git a/packages/web3-eth-accounts/src/tx/etnip1Transaction.ts b/packages/web3-eth-accounts/src/tx/etnip1Transaction.ts
index 8292df4f0fb..8b53c1e87ef 100644
--- a/packages/web3-eth-accounts/src/tx/etnip1Transaction.ts
+++ b/packages/web3-eth-accounts/src/tx/etnip1Transaction.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
-import { validateNoLeadingZeroes } from 'web3-validator';
+import { validateNoLeadingZeroes } from '@etn-sc/web3-validator';
 import { RLP } from '@ethereumjs/rlp';
-import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import { MAX_INTEGER, SECP256K1_ORDER_DIV_2, secp256k1 } from './constants.js';
 import { BaseTransaction } from './baseTransaction.js';
 import {
diff --git a/packages/web3-eth-accounts/src/tx/legacyTransaction.ts b/packages/web3-eth-accounts/src/tx/legacyTransaction.ts
index a7b05b7e4f3..0d84734e809 100644
--- a/packages/web3-eth-accounts/src/tx/legacyTransaction.ts
+++ b/packages/web3-eth-accounts/src/tx/legacyTransaction.ts
@@ -16,8 +16,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { RLP } from '@ethereumjs/rlp';
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
-import { bytesToHex } from 'web3-utils';
-import { validateNoLeadingZeroes } from 'web3-validator';
+import { bytesToHex } from '@etn-sc/web3-utils';
+import { validateNoLeadingZeroes } from '@etn-sc/web3-validator';
 import {
 	bigIntToHex,
 	bigIntToUnpaddedUint8Array,
diff --git a/packages/web3-eth-accounts/src/tx/transactionFactory.ts b/packages/web3-eth-accounts/src/tx/transactionFactory.ts
index 4e3346a2d14..9c4036189ce 100644
--- a/packages/web3-eth-accounts/src/tx/transactionFactory.ts
+++ b/packages/web3-eth-accounts/src/tx/transactionFactory.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Numbers } from 'web3-types';
+import { Numbers } from '@etn-sc/web3-types';
 import { toUint8Array, uint8ArrayToBigInt } from '../common/utils.js';
 import { FeeMarketEIP1559Transaction } from './eip1559Transaction.js';
 import { AccessListEIP2930Transaction } from './eip2930Transaction.js';
diff --git a/packages/web3-eth-accounts/src/tx/types.ts b/packages/web3-eth-accounts/src/tx/types.ts
index d87590cf54c..9361f86d15b 100644
--- a/packages/web3-eth-accounts/src/tx/types.ts
+++ b/packages/web3-eth-accounts/src/tx/types.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import type { HexString, Numbers } from 'web3-types';
+import type { HexString, Numbers } from '@etn-sc/web3-types';
 
 import type { Common } from '../common/common.js';
 // eslint-disable-next-line require-extensions/require-extensions
diff --git a/packages/web3-eth-accounts/src/tx/utils.ts b/packages/web3-eth-accounts/src/tx/utils.ts
index 3b2fabbe4ed..9b61e147afb 100644
--- a/packages/web3-eth-accounts/src/tx/utils.ts
+++ b/packages/web3-eth-accounts/src/tx/utils.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString } from 'web3-types';
-import { bytesToHex } from 'web3-utils';
+import { HexString } from '@etn-sc/web3-types';
+import { bytesToHex } from '@etn-sc/web3-utils';
 import { setLengthLeft, toUint8Array } from '../common/utils.js';
 import type { AccessList, AccessListUint8Array, AccessListItem } from './types.js';
 import { isAccessList } from './types.js';
diff --git a/packages/web3-eth-accounts/src/types.ts b/packages/web3-eth-accounts/src/types.ts
index 1b7fc7aeedd..b71522150de 100644
--- a/packages/web3-eth-accounts/src/types.ts
+++ b/packages/web3-eth-accounts/src/types.ts
@@ -15,13 +15,13 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3BaseWalletAccount, HexString } from 'web3-types';
-import { FeeMarketEIP1559TxData, AccessListEIP2930TxData, TxData } from './tx/types.js';
+import { Web3BaseWalletAccount, HexString } from '@etn-sc/web3-types';
+import { PriorityETNIP1TxData, FeeMarketEIP1559TxData, AccessListEIP2930TxData, TxData } from './tx/types.js';
 import {
 	AccessListEIP2930Transaction,
 	FeeMarketEIP1559Transaction,
-	Transaction,
 	PriorityETNIP1Transaction,
+	Transaction,
 } from './tx';
 
 export type SignatureObject = {
@@ -50,7 +50,7 @@ export type SignTransactionFunction = (
 		| TxData
 		| AccessListEIP2930TxData
 		| FeeMarketEIP1559TxData
-		| PriorityETNIP1Transaction
+		| PriorityETNIP1TxData
 		| Record<string, unknown>,
 ) => SignTransactionResult;
 
diff --git a/packages/web3-eth-accounts/src/wallet.ts b/packages/web3-eth-accounts/src/wallet.ts
index 8d50efd557a..5136bd31a05 100644
--- a/packages/web3-eth-accounts/src/wallet.ts
+++ b/packages/web3-eth-accounts/src/wallet.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3BaseWallet, Web3BaseWalletAccount, KeyStore } from 'web3-types';
-import { isNullish } from 'web3-validator';
+import { Web3BaseWallet, Web3BaseWalletAccount, KeyStore } from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
 import { WebStorage } from './types.js';
 
 type BrowserError = { code: number; name: string };
@@ -29,7 +29,7 @@ type BrowserError = { code: number; name: string };
  *  Web3AccountProvider - AccountProvider for the wallet
  *
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  * const web3 = new Web3("https://localhost:8454")
  * web3.eth.accounts.wallet
  * > Wallet(0) [
diff --git a/packages/web3-eth-accounts/test/fixtures/account.ts b/packages/web3-eth-accounts/test/fixtures/account.ts
index 758e8486e11..e8fe519e101 100644
--- a/packages/web3-eth-accounts/test/fixtures/account.ts
+++ b/packages/web3-eth-accounts/test/fixtures/account.ts
@@ -23,12 +23,11 @@ import {
 	InvalidPasswordError,
 	IVLengthError,
 	PBKDF2IterationsError,
-} from 'web3-errors';
-import { CipherOptions, KeyStore, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
-import { AccessListEIP2930TxData, FeeMarketEIP1559TxData, TxData } from '../../src/tx/types';
+} from '@etn-sc/web3-errors';
+import { CipherOptions, KeyStore, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
+import { PriorityETNIP1TxData, AccessListEIP2930TxData, FeeMarketEIP1559TxData, TxData } from '../../src/tx/types';
 import { sign, signTransaction, encrypt } from '../../src/account';
-import { PriorityETNIP1TxData } from '../../lib/commonjs';
 
 export const validPrivateKeyToAddressData: [string, string][] = [
 	[
diff --git a/packages/web3-eth-accounts/test/integration/account.test.ts b/packages/web3-eth-accounts/test/integration/account.test.ts
index 08bcb9bf922..6ac2ac9c5dd 100644
--- a/packages/web3-eth-accounts/test/integration/account.test.ts
+++ b/packages/web3-eth-accounts/test/integration/account.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address } from 'web3-types';
-import { Web3ValidatorError, isHexStrict } from 'web3-validator';
+import { Address } from '@etn-sc/web3-types';
+import { Web3ValidatorError, isHexStrict } from '@etn-sc/web3-validator';
 import {
 	create,
 	decrypt,
diff --git a/packages/web3-eth-accounts/test/integration/wallet.test.ts b/packages/web3-eth-accounts/test/integration/wallet.test.ts
index 0cbf2d8db62..231e81c2495 100644
--- a/packages/web3-eth-accounts/test/integration/wallet.test.ts
+++ b/packages/web3-eth-accounts/test/integration/wallet.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 
-import { Web3AccountProvider, KeyStore } from 'web3-types';
+import { Web3AccountProvider, KeyStore } from '@etn-sc/web3-types';
 import { isBrowser, isElectron, itIf } from '../fixtures/system_test_utils';
 import { Wallet } from '../../src';
 import * as accountProvider from '../../src/account';
diff --git a/packages/web3-eth-accounts/test/unit/account.test.ts b/packages/web3-eth-accounts/test/unit/account.test.ts
index d2ba42efa2f..9f0a9e982b0 100644
--- a/packages/web3-eth-accounts/test/unit/account.test.ts
+++ b/packages/web3-eth-accounts/test/unit/account.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address } from 'web3-types';
-import { Web3ValidatorError, isHexStrict } from 'web3-validator';
+import { Address } from '@etn-sc/web3-types';
+import { Web3ValidatorError, isHexStrict } from '@etn-sc/web3-validator';
 import {
 	create,
 	decrypt,
diff --git a/packages/web3-eth-accounts/test/unit/common/eips.test.ts b/packages/web3-eth-accounts/test/unit/common/eips.test.ts
index 9266eb037b9..3c7efd8db75 100644
--- a/packages/web3-eth-accounts/test/unit/common/eips.test.ts
+++ b/packages/web3-eth-accounts/test/unit/common/eips.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { toBigInt } from 'web3-utils';
+import { toBigInt } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 describe('[Common/EIPs]: Initialization / Chain params', () => {
diff --git a/packages/web3-eth-accounts/test/unit/common/hardforks.test.ts b/packages/web3-eth-accounts/test/unit/common/hardforks.test.ts
index 78229bf8d4e..1f9bdf0a9ee 100644
--- a/packages/web3-eth-accounts/test/unit/common/hardforks.test.ts
+++ b/packages/web3-eth-accounts/test/unit/common/hardforks.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, ConsensusAlgorithm, ConsensusType, Hardfork } from '../../../src/common';
 import gethGenesisKiln from '../../fixtures/common/geth-genesis-kiln.json';
 
diff --git a/packages/web3-eth-accounts/test/unit/common/mergePOS.test.ts b/packages/web3-eth-accounts/test/unit/common/mergePOS.test.ts
index a2337c58c32..1b19a12bd8e 100644
--- a/packages/web3-eth-accounts/test/unit/common/mergePOS.test.ts
+++ b/packages/web3-eth-accounts/test/unit/common/mergePOS.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { toBigInt } from 'web3-utils';
+import { toBigInt } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 import * as testnetMerge from '../../fixtures/common/merge/testnetMerge.json';
diff --git a/packages/web3-eth-accounts/test/unit/common/timestamp.test.ts b/packages/web3-eth-accounts/test/unit/common/timestamp.test.ts
index 6718119c349..40c96ddaca4 100644
--- a/packages/web3-eth-accounts/test/unit/common/timestamp.test.ts
+++ b/packages/web3-eth-accounts/test/unit/common/timestamp.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 import * as timestampJson from '../../fixtures/common/shanghai-time.json';
diff --git a/packages/web3-eth-accounts/test/unit/common/utils.test.ts b/packages/web3-eth-accounts/test/unit/common/utils.test.ts
index ae1660fc591..fc7d4901b8a 100644
--- a/packages/web3-eth-accounts/test/unit/common/utils.test.ts
+++ b/packages/web3-eth-accounts/test/unit/common/utils.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Common } from '../../../src/common/common';
 import { Hardfork } from '../../../src/common';
 import { parseGethGenesis } from '../../../src/common/utils';
diff --git a/packages/web3-eth-accounts/test/unit/tx/base.test.ts b/packages/web3-eth-accounts/test/unit/tx/base.test.ts
index fdfb7178317..b7c37603467 100644
--- a/packages/web3-eth-accounts/test/unit/tx/base.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/base.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { bytesToUint8Array, hexToBytes, uint8ArrayEquals } from 'web3-utils';
+import { bytesToUint8Array, hexToBytes, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import {
 	AccessListEIP2930Transaction,
 	Capability,
@@ -248,17 +248,19 @@ describe('[BaseTransaction]', () => {
 		for (const txType of txTypes) {
 			for (const [i, tx] of txType.txs.entries()) {
 				const { privateKey } = txType.fixtures[i];
-				if(tx.type == 64) {
+				if(tx.type === 64) {
 					if (privateKey !== undefined) {
 						// eslint-disable-next-line jest/no-conditional-expect
 						expect((tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey))).toBeTruthy();
 					}
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect(() => (tx as PriorityETNIP1Transaction).sign(new Uint8Array(bytesToUint8Array('invalid')))).toThrow();
 				} else {
 					if (privateKey !== undefined) {
 						// eslint-disable-next-line jest/no-conditional-expect
 						expect(tx.sign(hexToBytes(privateKey))).toBeTruthy();
 					}
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect(() => tx.sign(new Uint8Array(bytesToUint8Array('invalid')))).toThrow();
 				}
 			}
@@ -294,13 +296,8 @@ describe('[BaseTransaction]', () => {
 				if (privateKey === undefined) {
 					continue;
 				}
-				if(tx.type == 64) {
-					const signedTx = (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey));
-					expect(signedTx.getSenderAddress().toString()).toBe(`0x${sendersAddress}`);
-				} else {
-					const signedTx = tx.sign(hexToBytes(privateKey));
-					expect(signedTx.getSenderAddress().toString()).toBe(`0x${sendersAddress}`);
-				}
+				const signedTx = tx.type === 64? (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey)) : tx.sign(hexToBytes(privateKey));
+				expect(signedTx.getSenderAddress().toString()).toBe(`0x${sendersAddress}`);
 				
 			}
 		}
@@ -313,17 +310,20 @@ describe('[BaseTransaction]', () => {
 				if (privateKey === undefined) {
 					continue;
 				}
-				if(tx.type == 64) {
+				if(tx.type === 64) {
 					const signedTx = (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey));
-					const [txPubKey, txPrioKey] = (signedTx as PriorityETNIP1Transaction).getSenderAndPriorityPublicKey();
+					const [txPubKey, txPrioKey] = signedTx.getSenderAndPriorityPublicKey();
 					const pubKeyFromPriv = privateToPublic(hexToBytes(privateKey));
 					const prioKeyFromPriv = privateToPublic(hexToBytes(privateKey))
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect(uint8ArrayEquals(txPubKey, pubKeyFromPriv)).toBe(true);
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect(uint8ArrayEquals(txPrioKey, prioKeyFromPriv)).toBe(true);
 				} else {
 					const signedTx = tx.sign(hexToBytes(privateKey));
 					const txPubKey = signedTx.getSenderPublicKey();
 					const pubKeyFromPriv = privateToPublic(hexToBytes(privateKey));
+					// eslint-disable-next-line jest/no-conditional-expect
 					expect(uint8ArrayEquals(txPubKey, pubKeyFromPriv)).toBe(true);
 				}
 				
@@ -340,21 +340,12 @@ describe('[BaseTransaction]', () => {
 				if (privateKey === undefined) {
 					continue;
 				}
-				if(tx.type == 64) {
-					let signedTx = (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey));
-					signedTx = JSON.parse(JSON.stringify(signedTx)); // deep clone
-					(signedTx as any).s = SECP256K1_ORDER + BigInt(1);
-					expect(() => {
+				let signedTx = tx.type === 64 ? (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey)) : tx.sign(hexToBytes(privateKey));
+				signedTx = JSON.parse(JSON.stringify(signedTx)); // deep clone
+				(signedTx as any).s = SECP256K1_ORDER + BigInt(1);
+				expect(() => {
 						signedTx.getSenderPublicKey();
 				}).toThrow();
-				} else {
-					let signedTx = tx.sign(hexToBytes(privateKey));
-					signedTx = JSON.parse(JSON.stringify(signedTx)); // deep clone
-					(signedTx as any).s = SECP256K1_ORDER + BigInt(1);
-					expect(() => {
-						signedTx.getSenderPublicKey();
-					}).toThrow();
-				}
 			}
 		}
 	});
@@ -366,13 +357,8 @@ describe('[BaseTransaction]', () => {
 				if (privateKey === undefined) {
 					continue;
 				}
-				if(tx.type == 64) {
-					const signedTx = (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey));
-					expect(signedTx.verifySignature()).toBeTruthy();
-				} else {
-					const signedTx = tx.sign(hexToBytes(privateKey));
-					expect(signedTx.verifySignature()).toBeTruthy();
-				}
+				const signedTx = tx.type === 64 ? (tx as PriorityETNIP1Transaction).sign(hexToBytes(privateKey), hexToBytes(privateKey)) : tx.sign(hexToBytes(privateKey));
+				expect(signedTx.verifySignature()).toBeTruthy();
 			}
 		}
 	});
diff --git a/packages/web3-eth-accounts/test/unit/tx/eip1559.test.ts b/packages/web3-eth-accounts/test/unit/tx/eip1559.test.ts
index d9a0d8acb92..90bf9c30f0e 100644
--- a/packages/web3-eth-accounts/test/unit/tx/eip1559.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/eip1559.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { RLP } from '@ethereumjs/rlp';
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 import { FeeMarketEIP1559Transaction } from '../../../src';
diff --git a/packages/web3-eth-accounts/test/unit/tx/etnip1.test.ts b/packages/web3-eth-accounts/test/unit/tx/etnip1.test.ts
index 2d1c549ec2e..925fa90fafb 100644
--- a/packages/web3-eth-accounts/test/unit/tx/etnip1.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/etnip1.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { RLP } from '@ethereumjs/rlp';
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 import { PriorityETNIP1Transaction } from '../../../src';
diff --git a/packages/web3-eth-accounts/test/unit/tx/inputValue.test.ts b/packages/web3-eth-accounts/test/unit/tx/inputValue.test.ts
index e39ba839775..9372aea416a 100644
--- a/packages/web3-eth-accounts/test/unit/tx/inputValue.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/inputValue.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork, toUint8Array } from '../../../src/common';
 import { Address } from '../../../src/tx/address';
 
diff --git a/packages/web3-eth-accounts/test/unit/tx/legacy.test.ts b/packages/web3-eth-accounts/test/unit/tx/legacy.test.ts
index 7d9b754d0e0..20e4f9bd320 100644
--- a/packages/web3-eth-accounts/test/unit/tx/legacy.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/legacy.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { RLP } from '@ethereumjs/rlp';
-import { bytesToHex, hexToBytes, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import {
 	Chain,
 	Common,
diff --git a/packages/web3-eth-accounts/test/unit/tx/transactionFactory.test.ts b/packages/web3-eth-accounts/test/unit/tx/transactionFactory.test.ts
index 492ab27a63d..c4bc8bc934d 100644
--- a/packages/web3-eth-accounts/test/unit/tx/transactionFactory.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/transactionFactory.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 import { Chain, Common, Hardfork } from '../../../src/common';
 
 import {
diff --git a/packages/web3-eth-accounts/test/unit/tx/typedTxsAndEIP2930.test.ts b/packages/web3-eth-accounts/test/unit/tx/typedTxsAndEIP2930.test.ts
index 7b1a26ed045..da6801386b0 100644
--- a/packages/web3-eth-accounts/test/unit/tx/typedTxsAndEIP2930.test.ts
+++ b/packages/web3-eth-accounts/test/unit/tx/typedTxsAndEIP2930.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { bytesToHex, hexToBytes, uint8ArrayEquals, uint8ArrayConcat } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayEquals, uint8ArrayConcat } from '@etn-sc/web3-utils';
 import {
 	AccessListEIP2930Transaction,
 	AccessListUint8ArrayItem,
@@ -278,14 +278,14 @@ describe('[AccessListEIP2930Transaction / FeeMarketEIP1559Transaction] -> EIP-29
 				},
 				{ common },
 			);
-			let signed = tx.type == 64 ? (tx as PriorityETNIP1Transaction).sign(pKey, pKey) : tx.sign(pKey);
+			let signed = tx.type === 64 ? (tx as PriorityETNIP1Transaction).sign(pKey, pKey) : tx.sign(pKey);
 			const signedAddress = signed.getSenderAddress();
 			expect(uint8ArrayEquals(signedAddress.buf, address)).toBeTruthy();
 			// expect(signedAddress).toEqual(Address.publicToAddress(Buffer.from(address)));
 			signed.verifySignature(); // If this throws, test will not end.
 
 			tx = txType.class.fromTxData({}, { common });
-			signed = tx.type == 64 ? (tx as PriorityETNIP1Transaction).sign(pKey, pKey) : tx.sign(pKey);
+			signed = tx.type === 64 ? (tx as PriorityETNIP1Transaction).sign(pKey, pKey) : tx.sign(pKey);
 
 			expect(tx.accessList).toEqual([]);
 			expect(signed.accessList).toEqual([]);
@@ -303,7 +303,7 @@ describe('[AccessListEIP2930Transaction / FeeMarketEIP1559Transaction] -> EIP-29
 			expect(() => {
 				const high = SECP256K1_ORDER_DIV_2 + BigInt(1);
 				const _tx = txType.class.fromTxData({ s: high, r: 1, v: 1 }, { common });
-				const _signed = _tx.type == 64 ? (_tx as PriorityETNIP1Transaction).sign(pKey, pKey) : _tx.sign(pKey);
+				const _signed = _tx.type === 64 ? (_tx as PriorityETNIP1Transaction).sign(pKey, pKey) : _tx.sign(pKey);
 				_signed.getSenderPublicKey();
 			}).toThrow();
 		}
diff --git a/packages/web3-eth-accounts/test/unit/wallet.test.ts b/packages/web3-eth-accounts/test/unit/wallet.test.ts
index 2bc2c97c2e9..d399b2ecd24 100644
--- a/packages/web3-eth-accounts/test/unit/wallet.test.ts
+++ b/packages/web3-eth-accounts/test/unit/wallet.test.ts
@@ -18,7 +18,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 
 import { when } from 'jest-when';
-import { Web3AccountProvider, Web3BaseWalletAccount, KeyStore } from 'web3-types';
+import { Web3AccountProvider, Web3BaseWalletAccount, KeyStore } from '@etn-sc/web3-types';
 import { Wallet } from '../../src/wallet';
 
 describe('Wallet', () => {
diff --git a/packages/web3-eth-contract/README.md b/packages/web3-eth-contract/README.md
index 9de73d9556e..cb4008d3f55 100644
--- a/packages/web3-eth-contract/README.md
+++ b/packages/web3-eth-contract/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth-contract` contains the contract package used in `web3-eth`.
+`@etn-sc/web3-eth-contract` contains the contract package used in `@etn-sc/web3-eth`.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-contract) or using [Yarn](https://yarnpkg.com/package/web3-eth-contract)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-contract)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-contract
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-contract
+npm install @etn-sc/web3-eth-contract
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -44,7 +37,7 @@ yarn add web3-eth-contract
 You can initialize the typesafe Contract API instance with the following.
 
 ```ts
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 
 const abi = [...] as const;
 
@@ -60,7 +53,7 @@ const contract = new Contract(abi);
 
 We have tested the Typescript interface support for the ABIs compiled with solidity version `v0.4.x` and above. If you face any issue regarding the contract typing, please create an issue to report to us.
 
-The Typescript support for fixed length array types are supported up 30 elements. See more details [here](https://github.com/ChainSafe/web3.js/blob/nh%2F4562-contract-typing/packages/web3-eth-abi/src/number_map_type.ts#L1). This limitation is only to provide more performant developer experience in IDEs. In future we may come up with a workaround to avoid this limitation. If you have any idea feel free to share.
+The Typescript support for fixed length array types are supported up 30 elements. See more details [here](https://github.com/electroneum/electroneum-web3.js/blob/nh%2F4562-contract-typing/packages/web3-eth-abi/src/number_map_type.ts#L1). This limitation is only to provide more performant developer experience in IDEs. In future we may come up with a workaround to avoid this limitation. If you have any idea feel free to share.
 
 ## Package.json Scripts
 
@@ -76,7 +69,7 @@ The Typescript support for fixed length array types are supported up 30 elements
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-contract
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-contract
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-contract%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-contract
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-contract
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-contract?label=npm%20downloads
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
index b905e8500ce..610777b0974 100644
--- a/packages/web3-eth-contract/package.json
+++ b/packages/web3-eth-contract/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth-contract",
+	"name": "@etn-sc/web3-eth-contract",
 	"version": "4.1.3",
-	"description": "Web3 module to interact with Ethereum smart contracts.",
+	"description": "Web3 module to interact with Electroneum smart contracts.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ethereum/web3.js/tree/4.x/packages/web3-eth-contract",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-contract",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -45,13 +45,13 @@
 		"test:e2e:firefox": "npx cypress run --headless --browser firefox --env grep='ignore',invert=true"
 	},
 	"dependencies": {
-		"web3-core": "^4.3.1",
-		"web3-errors": "^1.1.4",
-		"web3-eth": "^4.3.1",
-		"web3-eth-abi": "^4.1.4",
-		"web3-types": "^1.3.1",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.1",
+		"@etn-sc/web3-errors": "^1.1.4",
+		"@etn-sc/web3-eth": "^4.3.1",
+		"@etn-sc/web3-eth-abi": "^4.1.4",
+		"@etn-sc/web3-types": "^1.3.1",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	},
 	"devDependencies": {
 		"@humeris/espresso-shot": "^4.0.0",
@@ -67,6 +67,6 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3-eth-accounts": "^4.1.0"
+		"@etn-sc/web3-eth-accounts": "^4.1.2"
 	}
 }
diff --git a/packages/web3-eth-contract/src/constant.ts b/packages/web3-eth-contract/src/constant.ts
index 6be67ffb159..639d43f1b15 100644
--- a/packages/web3-eth-contract/src/constant.ts
+++ b/packages/web3-eth-contract/src/constant.ts
@@ -14,4 +14,4 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-export { ALL_EVENTS, ALL_EVENTS_ABI } from 'web3-eth';
+export { ALL_EVENTS, ALL_EVENTS_ABI } from '@etn-sc/web3-eth';
diff --git a/packages/web3-eth-contract/src/contract.ts b/packages/web3-eth-contract/src/contract.ts
index 6290ab20140..edfe9372eb2 100644
--- a/packages/web3-eth-contract/src/contract.ts
+++ b/packages/web3-eth-contract/src/contract.ts
@@ -21,13 +21,13 @@ import {
 	Web3PromiEvent,
 	Web3ConfigEvent,
 	Web3SubscriptionManager,
-} from 'web3-core';
+} from '@etn-sc/web3-core';
 import {
 	ContractExecutionError,
 	ContractTransactionDataAndInputError,
 	SubscriptionError,
 	Web3ContractError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import {
 	createAccessList,
 	call,
@@ -39,7 +39,7 @@ import {
 	ALL_EVENTS,
 	ALL_EVENTS_ABI,
 	SendTransactionEvents,
-} from 'web3-eth';
+} from '@etn-sc/web3-eth';
 import {
 	encodeEventSignature,
 	encodeFunctionSignature,
@@ -48,7 +48,7 @@ import {
 	isAbiEventFragment,
 	isAbiFunctionFragment,
 	jsonInterfaceMethodToString,
-} from 'web3-eth-abi';
+} from '@etn-sc/web3-eth-abi';
 import {
 	AbiConstructorFragment,
 	AbiErrorFragment,
@@ -82,15 +82,15 @@ import {
 	EventLog,
 	ContractAbiWithSignature,
 	ContractOptions,
-} from 'web3-types';
-import { format, isDataFormat, keccak256, toChecksumAddress } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { format, isDataFormat, keccak256, toChecksumAddress } from '@etn-sc/web3-utils';
 import {
 	isNullish,
 	validator,
 	utils as validatorUtils,
 	ValidationSchemaInput,
 	Web3ValidatorError,
-} from 'web3-validator';
+} from '@etn-sc/web3-validator';
 import { decodeMethodReturn, encodeEventABI, encodeMethodABI } from './encoding.js';
 import { LogsSubscription } from './log_subscription.js';
 import {
diff --git a/packages/web3-eth-contract/src/encoding.ts b/packages/web3-eth-contract/src/encoding.ts
index aa06db45ae8..7e9e3397ab0 100644
--- a/packages/web3-eth-contract/src/encoding.ts
+++ b/packages/web3-eth-contract/src/encoding.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { format, isNullish, keccak256 } from 'web3-utils';
+import { format, isNullish, keccak256 } from '@etn-sc/web3-utils';
 
 import {
 	AbiConstructorFragment,
@@ -27,7 +27,7 @@ import {
 	FMT_NUMBER,
 	FMT_BYTES,
 	ContractOptions,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 import {
 	decodeParameters,
@@ -37,12 +37,12 @@ import {
 	encodeParameters,
 	isAbiConstructorFragment,
 	jsonInterfaceMethodToString,
-} from 'web3-eth-abi';
+} from '@etn-sc/web3-eth-abi';
 
-import { blockSchema, ALL_EVENTS } from 'web3-eth';
-import { Web3ContractError } from 'web3-errors';
+import { blockSchema, ALL_EVENTS } from '@etn-sc/web3-eth';
+import { Web3ContractError } from '@etn-sc/web3-errors';
 
-export { decodeEventABI } from 'web3-eth';
+export { decodeEventABI } from '@etn-sc/web3-eth';
 
 type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 export const encodeEventABI = (
diff --git a/packages/web3-eth-contract/src/log_subscription.ts b/packages/web3-eth-contract/src/log_subscription.ts
index 6ace1e17478..4dce5c15780 100644
--- a/packages/web3-eth-contract/src/log_subscription.ts
+++ b/packages/web3-eth-contract/src/log_subscription.ts
@@ -23,9 +23,9 @@ import {
 	DataFormat,
 	EventLog,
 	ContractAbiWithSignature,
-} from 'web3-types';
-import { Web3RequestManager, Web3Subscription, Web3SubscriptionManager } from 'web3-core';
-import { decodeEventABI } from 'web3-eth';
+} from '@etn-sc/web3-types';
+import { Web3RequestManager, Web3Subscription, Web3SubscriptionManager } from '@etn-sc/web3-core';
+import { decodeEventABI } from '@etn-sc/web3-eth';
 
 /**
  * LogSubscription to be used to subscribe to events logs.
diff --git a/packages/web3-eth-contract/src/types.ts b/packages/web3-eth-contract/src/types.ts
index fc66826b2e6..5355b8b918f 100644
--- a/packages/web3-eth-contract/src/types.ts
+++ b/packages/web3-eth-contract/src/types.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3ContextInitOptions, Web3PromiEvent } from 'web3-core';
+import { Web3ContextInitOptions, Web3PromiEvent } from '@etn-sc/web3-core';
 import {
 	AccessListResult,
 	BlockNumberOrTag,
@@ -28,13 +28,13 @@ import {
 	DataFormat,
 	DEFAULT_RETURN_FORMAT,
 	FormatType,
-} from 'web3-types';
-import { NewHeadsSubscription, SendTransactionEvents } from 'web3-eth';
+} from '@etn-sc/web3-types';
+import { NewHeadsSubscription, SendTransactionEvents } from '@etn-sc/web3-eth';
 import { LogsSubscription } from './log_subscription.js';
 
 export type NonPayableTxOptions = NonPayableCallOptions;
 export type PayableTxOptions = PayableCallOptions;
-export { ContractAbiWithSignature, EventLog, ContractOptions } from 'web3-types';
+export { ContractAbiWithSignature, EventLog, ContractOptions } from '@etn-sc/web3-types';
 
 export interface ContractEventOptions {
 	/**
diff --git a/packages/web3-eth-contract/src/utils.ts b/packages/web3-eth-contract/src/utils.ts
index 2cbe4a49715..c890a9abf73 100644
--- a/packages/web3-eth-contract/src/utils.ts
+++ b/packages/web3-eth-contract/src/utils.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3ContractError } from 'web3-errors';
+import { Web3ContractError } from '@etn-sc/web3-errors';
 import {
 	TransactionForAccessList,
 	AbiFunctionFragment,
@@ -27,8 +27,8 @@ import {
 	PayableCallOptions,
 	ContractInitOptions,
 	ContractOptions,
-} from 'web3-types';
-import { isNullish, mergeDeep } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { isNullish, mergeDeep } from '@etn-sc/web3-utils';
 import { encodeMethodABI } from './encoding.js';
 import { Web3ContractContext } from './types.js';
 
diff --git a/packages/web3-eth-contract/test/fixtures/erc20.ts b/packages/web3-eth-contract/test/fixtures/erc20.ts
index cf4b595ec8d..651432e3ec9 100644
--- a/packages/web3-eth-contract/test/fixtures/erc20.ts
+++ b/packages/web3-eth-contract/test/fixtures/erc20.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address, Numbers } from 'web3-types';
+import { Address, Numbers } from '@etn-sc/web3-types';
 import { LogsSubscription } from '../../src/log_subscription';
 import { ContractEventOptions, PayableMethodObject, NonPayableMethodObject } from '../../src/types';
 
diff --git a/packages/web3-eth-contract/test/fixtures/erc721.ts b/packages/web3-eth-contract/test/fixtures/erc721.ts
index 36c87289c24..4bc96537bd0 100644
--- a/packages/web3-eth-contract/test/fixtures/erc721.ts
+++ b/packages/web3-eth-contract/test/fixtures/erc721.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address, Numbers } from 'web3-types';
+import { Address, Numbers } from '@etn-sc/web3-types';
 import { LogsSubscription } from '../../src/log_subscription';
 import { ContractEventOptions, NonPayableMethodObject, PayableMethodObject } from '../../src/types';
 
diff --git a/packages/web3-eth-contract/test/integration/contract_defaults.test.ts b/packages/web3-eth-contract/test/integration/contract_defaults.test.ts
index b481237c739..9bcc3bd3d23 100644
--- a/packages/web3-eth-contract/test/integration/contract_defaults.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_defaults.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3BaseProvider } from 'web3-types';
-import { Web3Context } from 'web3-core';
+import { Web3BaseProvider } from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
 
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
diff --git a/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts b/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts
index b6d47be1442..1b311d2556d 100644
--- a/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_defaults_extra.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ValidChains, Hardfork, TransactionReceipt } from 'web3-types';
-import * as Web3Eth from 'web3-eth';
-import { TransactionBlockTimeoutError } from 'web3-errors';
+import { ValidChains, Hardfork, TransactionReceipt } from '@etn-sc/web3-types';
+import * as Web3Eth from '@etn-sc/web3-eth';
+import { TransactionBlockTimeoutError } from '@etn-sc/web3-errors';
 import { Contract } from '../../src';
 import { GreeterBytecode, GreeterAbi } from '../shared_fixtures/build/Greeter';
 import {
@@ -32,8 +32,8 @@ import {
 type Resolve = (value?: unknown) => void;
 const MAX_32_SIGNED_INTEGER = 2147483647;
 
-jest.mock('web3-eth', () => {
-	const original = jest.requireActual('web3-eth');
+jest.mock('@etn-sc/web3-eth', () => {
+	const original = jest.requireActual('@etn-sc/web3-eth');
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 	return {
 		...original,
diff --git a/packages/web3-eth-contract/test/integration/contract_deploy.test.ts b/packages/web3-eth-contract/test/integration/contract_deploy.test.ts
index 0fbafac4d0f..3c475646324 100644
--- a/packages/web3-eth-contract/test/integration/contract_deploy.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_deploy.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Eth } from 'web3-eth';
+import { Web3Eth } from '@etn-sc/web3-eth';
 import { Contract } from '../../src';
 import { sleep } from '../shared_fixtures/utils';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../shared_fixtures/build/ERC721Token';
diff --git a/packages/web3-eth-contract/test/integration/contract_erc20.test.ts b/packages/web3-eth-contract/test/integration/contract_erc20.test.ts
index 15d1852a055..97288397be1 100644
--- a/packages/web3-eth-contract/test/integration/contract_erc20.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_erc20.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { LogsOutput } from 'web3-types';
+import { LogsOutput } from '@etn-sc/web3-types';
 import { Contract } from '../../src';
 import { ERC20TokenAbi, ERC20TokenBytecode } from '../shared_fixtures/build/ERC20Token';
 import {
diff --git a/packages/web3-eth-contract/test/integration/contract_erc721.test.ts b/packages/web3-eth-contract/test/integration/contract_erc721.test.ts
index 9463a636930..ca43c161a94 100644
--- a/packages/web3-eth-contract/test/integration/contract_erc721.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_erc721.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { toBigInt } from 'web3-utils';
+import { toBigInt } from '@etn-sc/web3-utils';
 import { Contract } from '../../src';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../shared_fixtures/build/ERC721Token';
 import {
diff --git a/packages/web3-eth-contract/test/integration/contract_estimateGas_without_0x.test.ts b/packages/web3-eth-contract/test/integration/contract_estimateGas_without_0x.test.ts
index 91d484665eb..6d69bc6e8ff 100644
--- a/packages/web3-eth-contract/test/integration/contract_estimateGas_without_0x.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_estimateGas_without_0x.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ETH_DATA_FORMAT } from 'web3-types';
+import { ETH_DATA_FORMAT } from '@etn-sc/web3-types';
 import { Contract } from '../../src';
 import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
 
diff --git a/packages/web3-eth-contract/test/integration/contract_events.test.ts b/packages/web3-eth-contract/test/integration/contract_events.test.ts
index b84a875d173..f2b6bdf4472 100644
--- a/packages/web3-eth-contract/test/integration/contract_events.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_events.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EventLog } from 'web3-types';
+import { EventLog } from '@etn-sc/web3-types';
 import { Contract } from '../../src';
 import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
 import { processAsync } from '../shared_fixtures/utils';
diff --git a/packages/web3-eth-contract/test/integration/contract_filter_events.test.ts b/packages/web3-eth-contract/test/integration/contract_filter_events.test.ts
index 338cd448c12..450026d0e0b 100644
--- a/packages/web3-eth-contract/test/integration/contract_filter_events.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_filter_events.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { toBigInt } from 'web3-utils';
-import { EventLog } from 'web3-types';
+import { toBigInt } from '@etn-sc/web3-utils';
+import { EventLog } from '@etn-sc/web3-types';
 import { Contract } from '../../src';
 import { ERC20TokenAbi, ERC20TokenBytecode } from '../shared_fixtures/build/ERC20Token';
 import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
diff --git a/packages/web3-eth-contract/test/integration/contract_methods.test.ts b/packages/web3-eth-contract/test/integration/contract_methods.test.ts
index dc28f17799a..02bd18b3ff3 100644
--- a/packages/web3-eth-contract/test/integration/contract_methods.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_methods.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { ContractExecutionError } from 'web3-errors';
+import { ContractExecutionError } from '@etn-sc/web3-errors';
 import { Contract } from '../../src';
 import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
 import { getSystemTestProvider, createTempAccount } from '../fixtures/system_test_utils';
diff --git a/packages/web3-eth-contract/test/integration/contract_methods_errors.test.ts b/packages/web3-eth-contract/test/integration/contract_methods_errors.test.ts
index e51accfa09b..cb736a6717c 100644
--- a/packages/web3-eth-contract/test/integration/contract_methods_errors.test.ts
+++ b/packages/web3-eth-contract/test/integration/contract_methods_errors.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ContractExecutionError, ERR_CONTRACT_EXECUTION_REVERTED } from 'web3-errors';
+import { ContractExecutionError, ERR_CONTRACT_EXECUTION_REVERTED } from '@etn-sc/web3-errors';
 import { ErrorsContractAbi, ErrorsContractBytecode } from '../shared_fixtures/build/ErrorsContract';
 import { Contract } from '../../src';
 import {
diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_deploy.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_deploy.test.ts
index 7938636d8cb..70eb659f224 100644
--- a/packages/web3-eth-contract/test/integration/local_account/contract_deploy.test.ts
+++ b/packages/web3-eth-contract/test/integration/local_account/contract_deploy.test.ts
@@ -16,9 +16,9 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3Account } from 'web3-eth-accounts';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import { GreeterBytecode, GreeterAbi } from '../../shared_fixtures/build/Greeter';
 import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
 import { Contract } from '../../../src';
diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts
index edff03fe598..3bd2bb7440a 100644
--- a/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts
+++ b/packages/web3-eth-contract/test/integration/local_account/contract_erc20.test.ts
@@ -16,9 +16,9 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3Account } from 'web3-eth-accounts';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import { Contract } from '../../../src';
 import { ERC20TokenAbi, ERC20TokenBytecode } from '../../shared_fixtures/build/ERC20Token';
 import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts
index d9226c580f1..7d11c24d16f 100644
--- a/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts
+++ b/packages/web3-eth-contract/test/integration/local_account/contract_erc721.test.ts
@@ -16,9 +16,9 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3Account } from 'web3-eth-accounts';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import { Contract } from '../../../src';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../../shared_fixtures/build/ERC721Token';
 import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
diff --git a/packages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts b/packages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts
index 3e10c3268e4..4853210b8f2 100644
--- a/packages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts
+++ b/packages/web3-eth-contract/test/integration/local_account/contract_overloaded_methods.test.ts
@@ -16,11 +16,11 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3Account } from 'web3-eth-accounts';
-import { utf8ToHex } from 'web3-utils';
-import { EventLog } from 'web3-types';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
+import { utf8ToHex } from '@etn-sc/web3-utils';
+import { EventLog } from '@etn-sc/web3-types';
 import { Contract } from '../../../src';
 import { ERC721TokenAbi, ERC721TokenBytecode } from '../../shared_fixtures/build/ERC721Token';
 import { getSystemTestProvider, createLocalAccount } from '../../fixtures/system_test_utils';
diff --git a/packages/web3-eth-contract/test/unit/contract.test.ts b/packages/web3-eth-contract/test/unit/contract.test.ts
index 173ac8a5e4e..2e54f2b5b0d 100644
--- a/packages/web3-eth-contract/test/unit/contract.test.ts
+++ b/packages/web3-eth-contract/test/unit/contract.test.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import * as eth from 'web3-eth';
-import { ValidChains, Hardfork, AccessListResult, Address, ETH_DATA_FORMAT } from 'web3-types';
-import { Web3ContractError } from 'web3-errors';
-import { Web3Context } from 'web3-core';
+import * as eth from '@etn-sc/web3-eth';
+import { ValidChains, Hardfork, AccessListResult, Address, ETH_DATA_FORMAT } from '@etn-sc/web3-types';
+import { Web3ContractError } from '@etn-sc/web3-errors';
+import { Web3Context } from '@etn-sc/web3-core';
 
 import { Contract } from '../../src';
 import { sampleStorageContractABI } from '../fixtures/storage';
@@ -29,9 +29,9 @@ import { erc721Abi } from '../fixtures/erc721';
 import { ERC20TokenAbi } from '../shared_fixtures/build/ERC20Token';
 import { processAsync } from '../shared_fixtures/utils';
 
-jest.mock('web3-eth', () => {
-	const allAutoMocked = jest.createMockFromModule('web3-eth');
-	const actual = jest.requireActual('web3-eth');
+jest.mock('@etn-sc/web3-eth', () => {
+	const allAutoMocked = jest.createMockFromModule('@etn-sc/web3-eth');
+	const actual = jest.requireActual('@etn-sc/web3-eth');
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 	return {
 		__esModules: true,
diff --git a/packages/web3-eth-contract/test/unit/contract_typing.test.ts b/packages/web3-eth-contract/test/unit/contract_typing.test.ts
index 47ec3b88e15..82b29646c34 100644
--- a/packages/web3-eth-contract/test/unit/contract_typing.test.ts
+++ b/packages/web3-eth-contract/test/unit/contract_typing.test.ts
@@ -18,7 +18,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 /* eslint-disable jest/expect-expect */
 
 import { expectTypeOf, typecheck } from '@humeris/espresso-shot';
-import { Numbers } from 'web3-types';
+import { Numbers } from '@etn-sc/web3-types';
 import { Contract } from '../../src/contract';
 import { erc20Abi, Erc20Interface } from '../fixtures/erc20';
 import { erc721Abi, Erc721Interface } from '../fixtures/erc721';
diff --git a/packages/web3-eth-contract/test/unit/encode_event_abi.test.ts b/packages/web3-eth-contract/test/unit/encode_event_abi.test.ts
index c4353806ba9..60908199e2a 100644
--- a/packages/web3-eth-contract/test/unit/encode_event_abi.test.ts
+++ b/packages/web3-eth-contract/test/unit/encode_event_abi.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiEventFragment, ContractOptions } from 'web3-types';
+import { AbiEventFragment, ContractOptions } from '@etn-sc/web3-types';
 import { encodeEventABI } from '../../src';
 
 const contractOptions: ContractOptions = {
diff --git a/packages/web3-eth-ens/README.md b/packages/web3-eth-ens/README.md
index ea4f306a767..918dcab00d3 100644
--- a/packages/web3-eth-ens/README.md
+++ b/packages/web3-eth-ens/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth-ens` This package has ENS functions for interacting with Ethereum Name Service.
+`@etn-sc/web3-eth-ens` This package has ENS functions for interacting with Electroneum Name Service.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-ens) or using [Yarn](https://yarnpkg.com/package/web3-eth-ens)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-ens)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-ens
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-ens
+npm install @etn-sc/web3-eth-ens
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth-ens
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-ens
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-ens
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-ens%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-ens
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-ens
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-ens?label=npm%20downloads
diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json
index 6d38e795878..f28ecdea9a7 100644
--- a/packages/web3-eth-ens/package.json
+++ b/packages/web3-eth-ens/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth-ens",
+	"name": "@etn-sc/web3-eth-ens",
 	"version": "4.0.8",
-	"description": "This package has ENS functions for interacting with Ethereum Name Service.",
+	"description": "This package has ENS functions for interacting with Electroneum Name Service.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -59,13 +59,13 @@
 	},
 	"dependencies": {
 		"@adraffy/ens-normalize": "^1.8.8",
-		"web3-core": "^4.3.0",
-		"web3-errors": "^1.1.3",
-		"web3-eth": "^4.3.1",
-		"web3-eth-contract": "^4.1.2",
-		"web3-net": "^4.0.7",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-eth": "^4.3.1",
+		"@etn-sc/web3-eth-contract": "^4.1.2",
+		"@etn-sc/web3-net": "^4.0.7",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-eth-ens/src/ens.ts b/packages/web3-eth-ens/src/ens.ts
index 26c642efc13..518284fb11c 100644
--- a/packages/web3-eth-ens/src/ens.ts
+++ b/packages/web3-eth-ens/src/ens.ts
@@ -15,18 +15,18 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context, Web3ContextObject } from 'web3-core';
-import { ENSNetworkNotSyncedError, ENSUnsupportedNetworkError } from 'web3-errors';
-import { isSyncing } from 'web3-eth';
-import { Contract } from 'web3-eth-contract';
-import { getId } from 'web3-net';
+import { Web3Context, Web3ContextObject } from '@etn-sc/web3-core';
+import { ENSNetworkNotSyncedError, ENSUnsupportedNetworkError } from '@etn-sc/web3-errors';
+import { isSyncing } from '@etn-sc/web3-eth';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { getId } from '@etn-sc/web3-net';
 import {
 	DEFAULT_RETURN_FORMAT,
 	EthExecutionAPI,
 	FMT_NUMBER,
 	SupportedProviders,
 	Web3NetAPI,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { PublicResolverAbi } from './abi/ens/PublicResolver.js';
 import { networkIds, registryAddresses } from './config.js';
 import { Registry } from './registry.js';
diff --git a/packages/web3-eth-ens/src/registry.ts b/packages/web3-eth-ens/src/registry.ts
index 1c41435e54b..c79dc796fcf 100644
--- a/packages/web3-eth-ens/src/registry.ts
+++ b/packages/web3-eth-ens/src/registry.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3ContextObject } from 'web3-core';
-import { Contract } from 'web3-eth-contract';
-import { Address } from 'web3-types';
+import { Web3ContextObject } from '@etn-sc/web3-core';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { Address } from '@etn-sc/web3-types';
 import { ENSRegistryAbi } from './abi/ens/ENSRegistry.js';
 import { PublicResolverAbi } from './abi/ens/PublicResolver.js';
 import { registryAddresses } from './config.js';
diff --git a/packages/web3-eth-ens/src/resolver.ts b/packages/web3-eth-ens/src/resolver.ts
index 3540455f3d5..2f3b91215cd 100644
--- a/packages/web3-eth-ens/src/resolver.ts
+++ b/packages/web3-eth-ens/src/resolver.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ResolverMethodMissingError } from 'web3-errors';
-import { Contract } from 'web3-eth-contract';
-import { isNullish, sha3 } from 'web3-utils';
-import { isHexStrict } from 'web3-validator';
+import { ResolverMethodMissingError } from '@etn-sc/web3-errors';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { isNullish, sha3 } from '@etn-sc/web3-utils';
+import { isHexStrict } from '@etn-sc/web3-validator';
 import { PublicResolverAbi } from './abi/ens/PublicResolver.js';
 import { interfaceIds, methodsInInterface } from './config.js';
 import { Registry } from './registry.js';
diff --git a/packages/web3-eth-ens/src/utils.ts b/packages/web3-eth-ens/src/utils.ts
index 0184929790c..57af57e2229 100644
--- a/packages/web3-eth-ens/src/utils.ts
+++ b/packages/web3-eth-ens/src/utils.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { sha3Raw } from 'web3-utils';
+import { sha3Raw } from '@etn-sc/web3-utils';
 // eslint-disable-next-line camelcase
 import { ens_normalize } from '@adraffy/ens-normalize';
 
diff --git a/packages/web3-eth-ens/test/integration/ens.events.test.ts b/packages/web3-eth-ens/test/integration/ens.events.test.ts
index 79e37c212cb..2df56f4722d 100644
--- a/packages/web3-eth-ens/test/integration/ens.events.test.ts
+++ b/packages/web3-eth-ens/test/integration/ens.events.test.ts
@@ -16,13 +16,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Contract, PayableTxOptions } from 'web3-eth-contract';
-import { sha3 } from 'web3-utils';
-import { getBlock } from 'web3-eth';
+import { Contract, PayableTxOptions } from '@etn-sc/web3-eth-contract';
+import { sha3 } from '@etn-sc/web3-utils';
+import { getBlock } from '@etn-sc/web3-eth';
 
-import { Address, Bytes, DEFAULT_RETURN_FORMAT } from 'web3-types';
+import { Address, Bytes, DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { ENS } from '../../src';
 import { namehash } from '../../src/utils';
 
diff --git a/packages/web3-eth-ens/test/integration/ens.test.ts b/packages/web3-eth-ens/test/integration/ens.test.ts
index bd978461e59..1bef4fc3a4c 100644
--- a/packages/web3-eth-ens/test/integration/ens.test.ts
+++ b/packages/web3-eth-ens/test/integration/ens.test.ts
@@ -16,12 +16,12 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { getBlock } from 'web3-eth';
-import { Contract, PayableTxOptions } from 'web3-eth-contract';
-import { Address, Bytes, DEFAULT_RETURN_FORMAT } from 'web3-types';
-import { sha3, toChecksumAddress } from 'web3-utils';
+import { getBlock } from '@etn-sc/web3-eth';
+import { Contract, PayableTxOptions } from '@etn-sc/web3-eth-contract';
+import { Address, Bytes, DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+import { sha3, toChecksumAddress } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { ENS } from '../../src';
 import { namehash } from '../../src/utils';
 
diff --git a/packages/web3-eth-ens/test/integration/resolver.test.ts b/packages/web3-eth-ens/test/integration/resolver.test.ts
index d34aaaffc72..ee7aa80a487 100644
--- a/packages/web3-eth-ens/test/integration/resolver.test.ts
+++ b/packages/web3-eth-ens/test/integration/resolver.test.ts
@@ -16,13 +16,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import Web3Eth from 'web3-eth';
-import { Contract, PayableTxOptions } from 'web3-eth-contract';
-import { sha3 } from 'web3-utils';
+import Web3Eth from '@etn-sc/web3-eth';
+import { Contract, PayableTxOptions } from '@etn-sc/web3-eth-contract';
+import { sha3 } from '@etn-sc/web3-utils';
 
-import { Address, Bytes, DEFAULT_RETURN_FORMAT } from 'web3-types';
+import { Address, Bytes, DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { ENS } from '../../src';
 import { namehash } from '../../src/utils';
 
diff --git a/packages/web3-eth-ens/test/unit/constructor.test.ts b/packages/web3-eth-ens/test/unit/constructor.test.ts
index 8bb4ec2230d..ba8242ef315 100644
--- a/packages/web3-eth-ens/test/unit/constructor.test.ts
+++ b/packages/web3-eth-ens/test/unit/constructor.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context, Web3ContextObject } from 'web3-core';
+import { Web3Context, Web3ContextObject } from '@etn-sc/web3-core';
 import { Registry } from '../../src/registry';
 import { Resolver } from '../../src/resolver';
 import { ENS } from '../../src/ens';
diff --git a/packages/web3-eth-ens/test/unit/ens.test.ts b/packages/web3-eth-ens/test/unit/ens.test.ts
index 9f6f4dd7efe..0553730f68a 100644
--- a/packages/web3-eth-ens/test/unit/ens.test.ts
+++ b/packages/web3-eth-ens/test/unit/ens.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context, Web3ContextObject, Web3PromiEvent } from 'web3-core';
-import { ENSNetworkNotSyncedError, ENSUnsupportedNetworkError } from 'web3-errors';
-import { Contract } from 'web3-eth-contract';
+import { Web3Context, Web3ContextObject, Web3PromiEvent } from '@etn-sc/web3-core';
+import { ENSNetworkNotSyncedError, ENSUnsupportedNetworkError } from '@etn-sc/web3-errors';
+import { Contract } from '@etn-sc/web3-eth-contract';
 import { PublicResolverAbi } from '../../src/abi/ens/PublicResolver';
 import { registryAddresses } from '../../src/config';
 
@@ -25,20 +25,20 @@ import { ENS } from '../../src/ens';
 
 jest.useFakeTimers().setSystemTime(new Date('2020-01-01'));
 
-jest.mock('web3-eth', () => ({
+jest.mock('@etn-sc/web3-eth', () => ({
 	__esModule: true,
 	isSyncing: jest.fn(),
 }));
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const { isSyncing } = require('web3-eth');
+const { isSyncing } = require('@etn-sc/web3-eth');
 
 const expectedNetworkId = '0x1';
-jest.mock('web3-net', () => ({
+jest.mock('@etn-sc/web3-net', () => ({
 	getId: jest.fn(),
 }));
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const { getId } = require('web3-net');
+const { getId } = require('@etn-sc/web3-net');
 
 describe('ens', () => {
 	let object: Web3ContextObject;
diff --git a/packages/web3-eth-ens/test/unit/registry.test.ts b/packages/web3-eth-ens/test/unit/registry.test.ts
index d0b4f1ce751..4f764a8e260 100644
--- a/packages/web3-eth-ens/test/unit/registry.test.ts
+++ b/packages/web3-eth-ens/test/unit/registry.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context, Web3ContextObject } from 'web3-core';
-import { NonPayableMethodObject } from 'web3-eth-contract';
+import { Web3Context, Web3ContextObject } from '@etn-sc/web3-core';
+import { NonPayableMethodObject } from '@etn-sc/web3-eth-contract';
 import { Registry } from '../../src/registry';
 import { namehash } from '../../src/utils';
 
diff --git a/packages/web3-eth-ens/test/unit/resolver.test.ts b/packages/web3-eth-ens/test/unit/resolver.test.ts
index 97cf6e2d0b3..3bb25bee6c9 100644
--- a/packages/web3-eth-ens/test/unit/resolver.test.ts
+++ b/packages/web3-eth-ens/test/unit/resolver.test.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context, Web3ContextObject } from 'web3-core';
-import { ResolverMethodMissingError } from 'web3-errors';
-import { Contract, NonPayableMethodObject } from 'web3-eth-contract';
-import { sha3 } from 'web3-utils';
+import { Web3Context, Web3ContextObject } from '@etn-sc/web3-core';
+import { ResolverMethodMissingError } from '@etn-sc/web3-errors';
+import { Contract, NonPayableMethodObject } from '@etn-sc/web3-eth-contract';
+import { sha3 } from '@etn-sc/web3-utils';
 import { PublicResolverAbi } from '../../src/abi/ens/PublicResolver';
 import { interfaceIds, methodsInInterface } from '../../src/config';
 import { Registry } from '../../src/registry';
diff --git a/packages/web3-eth-iban/README.md b/packages/web3-eth-iban/README.md
index 11c7e52305b..a9ad2584ce6 100644
--- a/packages/web3-eth-iban/README.md
+++ b/packages/web3-eth-iban/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth-iban` This package converts Ethereum addresses to IBAN addresses a vice versa.
+`@etn-sc/web3-eth-iban` This package converts Electroneum addresses to IBAN addresses a vice versa.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-iban) or using [Yarn](https://yarnpkg.com/package/web3-eth-iban)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-iban)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-iban
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-iban
+npm install @etn-sc/web3-eth-iban
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth-iban
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-iban
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-iban
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-iban%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-iban
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-iban
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-iban?label=npm%20downloads
diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json
index c04c1b0476c..c058f9007e2 100644
--- a/packages/web3-eth-iban/package.json
+++ b/packages/web3-eth-iban/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth-iban",
+	"name": "@etn-sc/web3-eth-iban",
 	"version": "4.0.7",
-	"description": "This package converts Ethereum addresses to IBAN addresses and vice versa.",
+	"description": "This package converts Electroneum addresses to IBAN addresses and vice versa.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -56,9 +56,9 @@
 		"typescript": "^4.7.4"
 	},
 	"dependencies": {
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-eth-iban/src/iban.ts b/packages/web3-eth-iban/src/iban.ts
index db7e024e3cf..efb85bfb7e1 100644
--- a/packages/web3-eth-iban/src/iban.ts
+++ b/packages/web3-eth-iban/src/iban.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { HexString } from 'web3-types';
-import { toChecksumAddress, leftPad, hexToNumber } from 'web3-utils';
-import { isAddress } from 'web3-validator';
-import { InvalidAddressError } from 'web3-errors';
+import { HexString } from '@etn-sc/web3-types';
+import { toChecksumAddress, leftPad, hexToNumber } from '@etn-sc/web3-utils';
+import { isAddress } from '@etn-sc/web3-validator';
+import { InvalidAddressError } from '@etn-sc/web3-errors';
 import { IbanOptions } from './types.js';
 
 /**
diff --git a/packages/web3-eth-personal/README.md b/packages/web3-eth-personal/README.md
index 857d97d88f2..729e4534ec3 100644
--- a/packages/web3-eth-personal/README.md
+++ b/packages/web3-eth-personal/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth-personal` Web3 module to interact with the Ethereum blockchain accounts stored in the node.
+`@etn-sc/web3-eth-personal` Web3 module to interact with the Electroneum blockchain accounts stored in the node.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth-personal) or using [Yarn](https://yarnpkg.com/package/web3-eth-personal)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth-personal)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth-personal
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth-personal
+npm install @etn-sc/web3-eth-personal
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth-personal
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth-personal
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-personal
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-personal%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth-personal
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth-personal
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth-personal?label=npm%20downloads
diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json
index ad0c3088cb1..04b657beaff 100644
--- a/packages/web3-eth-personal/package.json
+++ b/packages/web3-eth-personal/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth-personal",
+	"name": "@etn-sc/web3-eth-personal",
 	"version": "4.0.8",
-	"description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.",
+	"description": "Web3 module to interact with the Electroneum blockchain accounts stored in the node.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -42,12 +42,12 @@
 		"test:integration": "jest --config=./test/integration/jest.config.js"
 	},
 	"dependencies": {
-		"web3-core": "^4.3.0",
-		"web3-eth": "^4.3.1",
-		"web3-rpc-methods": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-eth": "^4.3.1",
+		"@etn-sc/web3-rpc-methods": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	},
 	"devDependencies": {
 		"@types/jest": "^28.1.6",
@@ -62,6 +62,6 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3-providers-ws": "^4.0.7"
+		"@etn-sc/web3-providers-ws": "^4.0.7"
 	}
 }
diff --git a/packages/web3-eth-personal/src/index.ts b/packages/web3-eth-personal/src/index.ts
index 62576d7bae1..45359be37b7 100644
--- a/packages/web3-eth-personal/src/index.ts
+++ b/packages/web3-eth-personal/src/index.ts
@@ -20,13 +20,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  *
  * **_NOTE:_**  Many of these functions send sensitive information like passwords. Never call these functions over a unsecured Websocket or HTTP provider, as your password will be sent in plain text!
  *
- * import Personal from 'web3-eth-personal';
+ * import Personal from '@etn-sc/web3-eth-personal';
  *
  * const personal = new Personal('http://localhost:8545');
  *
  * or using the web3 umbrella package
  *
- * import Personal from 'web3-eth-personal';
+ * import Personal from '@etn-sc/web3-eth-personal';
  * const web3 = new Web3('http://localhost:8545');
  * // web3.eth.personal
  */
diff --git a/packages/web3-eth-personal/src/personal.ts b/packages/web3-eth-personal/src/personal.ts
index f89f6fa1d0c..d6a9155ee6a 100644
--- a/packages/web3-eth-personal/src/personal.ts
+++ b/packages/web3-eth-personal/src/personal.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
-import { Address, EthPersonalAPI, HexString, Transaction } from 'web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Address, EthPersonalAPI, HexString, Transaction } from '@etn-sc/web3-types';
 
 import * as rpcWrappers from './rpc_method_wrappers.js';
 
diff --git a/packages/web3-eth-personal/src/rpc_method_wrappers.ts b/packages/web3-eth-personal/src/rpc_method_wrappers.ts
index 51491714881..c0d3daf9a23 100644
--- a/packages/web3-eth-personal/src/rpc_method_wrappers.ts
+++ b/packages/web3-eth-personal/src/rpc_method_wrappers.ts
@@ -14,12 +14,12 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3RequestManager } from 'web3-core';
-import { toChecksumAddress, utf8ToHex } from 'web3-utils';
-import { formatTransaction } from 'web3-eth';
-import { Address, EthPersonalAPI, ETH_DATA_FORMAT, HexString, Transaction } from 'web3-types';
-import { validator, isHexStrict } from 'web3-validator';
-import { personalRpcMethods } from 'web3-rpc-methods';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { toChecksumAddress, utf8ToHex } from '@etn-sc/web3-utils';
+import { formatTransaction } from '@etn-sc/web3-eth';
+import { Address, EthPersonalAPI, ETH_DATA_FORMAT, HexString, Transaction } from '@etn-sc/web3-types';
+import { validator, isHexStrict } from '@etn-sc/web3-validator';
+import { personalRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 export const getAccounts = async (requestManager: Web3RequestManager<EthPersonalAPI>) => {
 	const result = await personalRpcMethods.getAccounts(requestManager);
diff --git a/packages/web3-eth-personal/test/integration/personal.test.ts b/packages/web3-eth-personal/test/integration/personal.test.ts
index ed2fe1311a2..0522867d081 100644
--- a/packages/web3-eth-personal/test/integration/personal.test.ts
+++ b/packages/web3-eth-personal/test/integration/personal.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { EthPersonalAPI, SupportedProviders } from 'web3-types';
-import { toChecksumAddress } from 'web3-utils';
-import { isHexStrict } from 'web3-validator';
+import { EthPersonalAPI, SupportedProviders } from '@etn-sc/web3-types';
+import { toChecksumAddress } from '@etn-sc/web3-utils';
+import { isHexStrict } from '@etn-sc/web3-validator';
 import { Personal } from '../../src/index';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth-personal/test/unit/eth_personal.test.ts b/packages/web3-eth-personal/test/unit/eth_personal.test.ts
index fc2d545da10..a73557b578e 100644
--- a/packages/web3-eth-personal/test/unit/eth_personal.test.ts
+++ b/packages/web3-eth-personal/test/unit/eth_personal.test.ts
@@ -15,15 +15,15 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ETH_DATA_FORMAT } from 'web3-types';
-import * as utils from 'web3-utils';
-import * as eth from 'web3-eth';
-import * as validator from 'web3-validator';
+import { ETH_DATA_FORMAT } from '@etn-sc/web3-types';
+import * as utils from '@etn-sc/web3-utils';
+import * as eth from '@etn-sc/web3-eth';
+import * as validator from '@etn-sc/web3-validator';
 import { Personal } from '../../src/index';
 
-jest.mock('web3-utils');
-jest.mock('web3-eth');
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-utils');
+jest.mock('@etn-sc/web3-eth');
+jest.mock('@etn-sc/web3-validator');
 describe('Personal', () => {
 	let personal: Personal;
 	let sendSpy: jest.SpyInstance;
diff --git a/packages/web3-eth/README.md b/packages/web3-eth/README.md
index a7d675b599c..cfa28336477 100644
--- a/packages/web3-eth/README.md
+++ b/packages/web3-eth/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-eth` contains modules to interact with the Ethereum blockchain and smart contracts.
+`@etn-sc/web3-eth` contains modules to interact with the Electroneum blockchain and smart contracts.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-eth) or using [Yarn](https://yarnpkg.com/package/web3-eth)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-eth)
 
 ### Using NPM
 
 ```bash
-npm install web3-eth
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-eth
+npm install @etn-sc/web3-eth
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-eth
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-eth
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-eth
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-eth
 [downloads-image]: https://img.shields.io/npm/dm/web3-eth?label=npm%20downloads
diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json
index 4cfb96130fb..64483b2d0fd 100644
--- a/packages/web3-eth/package.json
+++ b/packages/web3-eth/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-eth",
+	"name": "@etn-sc/web3-eth",
 	"version": "4.3.1",
-	"description": "Web3 module to interact with the Ethereum blockchain and smart contracts.",
+	"description": "Web3 module to interact with the Electroneum blockchain and smart contracts.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -59,19 +59,19 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3-providers-http": "^4.1.0"
+		"@etn-sc/web3-providers-http": "^4.1.0"
 	},
 	"dependencies": {
 		"setimmediate": "^1.0.5",
-		"web3-core": "^4.3.0",
-		"web3-errors": "^1.1.3",
-		"web3-eth-abi": "^4.1.4",
-		"web3-eth-accounts": "^4.1.0",
-		"web3-net": "^4.0.7",
-		"web3-providers-ws": "^4.0.7",
-		"web3-rpc-methods": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-eth-abi": "^4.1.4",
+		"@etn-sc/web3-eth-accounts": "^4.1.0",
+		"@etn-sc/web3-net": "^4.0.7",
+		"@etn-sc/web3-providers-ws": "^4.0.7",
+		"@etn-sc/web3-rpc-methods": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-eth/src/constants.ts b/packages/web3-eth/src/constants.ts
index 13a485719a0..9c51845963a 100644
--- a/packages/web3-eth/src/constants.ts
+++ b/packages/web3-eth/src/constants.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiEventFragment, FMT_BYTES, FMT_NUMBER } from 'web3-types';
+import { AbiEventFragment, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
 
 export const ALL_EVENTS = 'ALLEVENTS';
 export const ALL_EVENTS_ABI = {
diff --git a/packages/web3-eth/src/index.ts b/packages/web3-eth/src/index.ts
index d1f1d326832..921c1ca0066 100644
--- a/packages/web3-eth/src/index.ts
+++ b/packages/web3-eth/src/index.ts
@@ -20,10 +20,10 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  *
  * To use this package standalone and use its methods use:
  * ```ts
- * import { Web3Context } from 'web3-core';
- * import { BlockTags } from 'web3-types';
- * import { DEFAULT_RETURN_FORMAT } from 'web3-types';
- * import { getBalance} from 'web3-eth';
+ * import { Web3Context } from '@etn-sc/web3-core';
+ * import { BlockTags } from '@etn-sc/web3-types';
+ * import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+ * import { getBalance} from '@etn-sc/web3-eth';
  *
  * getBalance(
  *      new Web3Context('http://127.0.0.1:8545'),
@@ -36,7 +36,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  *
  * To use this package within the `web3` object use:
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  *
  * const web3 = new Web3(Web3.givenProvider || 'ws://some.local-or-remote.node:8546');
  * web3.eth.getBalance('0x407d73d8a49eeb85d32cf465507dd71d507100c1').then(console.log);
diff --git a/packages/web3-eth/src/rpc_method_wrappers.ts b/packages/web3-eth/src/rpc_method_wrappers.ts
index 7aad8d33a81..1791ad51488 100644
--- a/packages/web3-eth/src/rpc_method_wrappers.ts
+++ b/packages/web3-eth/src/rpc_method_wrappers.ts
@@ -47,13 +47,13 @@ import {
 	TransactionForAccessList,
 	AccessListResult,
 	Eip712TypedData,
-} from 'web3-types';
-import { Web3Context, Web3PromiEvent } from 'web3-core';
-import { format, hexToBytes, bytesToUint8Array, numberToHex } from 'web3-utils';
-import { TransactionFactory } from 'web3-eth-accounts';
-import { isBlockTag, isBytes, isNullish, isString } from 'web3-validator';
-import { SignatureError } from 'web3-errors';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { Web3Context, Web3PromiEvent } from '@etn-sc/web3-core';
+import { format, hexToBytes, bytesToUint8Array, numberToHex } from '@etn-sc/web3-utils';
+import { TransactionFactory } from '@etn-sc/web3-eth-accounts';
+import { isBlockTag, isBytes, isNullish, isString } from '@etn-sc/web3-validator';
+import { SignatureError } from '@etn-sc/web3-errors';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { decodeSignedTransaction } from './utils/decode_signed_transaction.js';
 import {
diff --git a/packages/web3-eth/src/types.ts b/packages/web3-eth/src/types.ts
index ae97084ea72..6b828608dc1 100644
--- a/packages/web3-eth/src/types.ts
+++ b/packages/web3-eth/src/types.ts
@@ -21,7 +21,7 @@ import {
 	TransactionRevertInstructionError,
 	TransactionRevertWithCustomError,
 	InvalidResponseError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import {
 	FormatType,
 	ETH_DATA_FORMAT,
@@ -32,7 +32,7 @@ import {
 	Numbers,
 	Transaction,
 	TransactionReceipt,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 export type InternalTransaction = FormatType<Transaction, typeof ETH_DATA_FORMAT>;
 
diff --git a/packages/web3-eth/src/utils/decode_signed_transaction.ts b/packages/web3-eth/src/utils/decode_signed_transaction.ts
index 943ea188e2c..2344cfecd87 100644
--- a/packages/web3-eth/src/utils/decode_signed_transaction.ts
+++ b/packages/web3-eth/src/utils/decode_signed_transaction.ts
@@ -19,9 +19,9 @@ import {
 	HexStringBytes,
 	SignedTransactionInfoAPI,
 	TransactionSignedAPI,
-} from 'web3-types';
-import { bytesToHex, format, hexToBytes, keccak256 } from 'web3-utils';
-import { TransactionFactory } from 'web3-eth-accounts';
+} from '@etn-sc/web3-types';
+import { bytesToHex, format, hexToBytes, keccak256 } from '@etn-sc/web3-utils';
+import { TransactionFactory } from '@etn-sc/web3-eth-accounts';
 import { detectRawTransactionType } from './detect_transaction_type.js';
 import { formatTransaction } from './format_transaction.js';
 
diff --git a/packages/web3-eth/src/utils/decoding.ts b/packages/web3-eth/src/utils/decoding.ts
index f4b61c0a5ac..e470dacd3d6 100644
--- a/packages/web3-eth/src/utils/decoding.ts
+++ b/packages/web3-eth/src/utils/decoding.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { format } from 'web3-utils';
+import { format } from '@etn-sc/web3-utils';
 
 import {
 	AbiEventFragment,
@@ -24,9 +24,9 @@ import {
 	DEFAULT_RETURN_FORMAT,
 	EventLog,
 	ContractAbiWithSignature,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
-import { decodeLog } from 'web3-eth-abi';
+import { decodeLog } from '@etn-sc/web3-eth-abi';
 
 import { logSchema } from '../schemas.js';
 import { ALL_EVENTS } from '../constants.js';
diff --git a/packages/web3-eth/src/utils/detect_transaction_type.ts b/packages/web3-eth/src/utils/detect_transaction_type.ts
index ec5539b375a..f108ebec8e7 100644
--- a/packages/web3-eth/src/utils/detect_transaction_type.ts
+++ b/packages/web3-eth/src/utils/detect_transaction_type.ts
@@ -15,11 +15,11 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { format, toHex } from 'web3-utils';
-import { TransactionTypeParser, Web3Context } from 'web3-core';
-import { EthExecutionAPI, HardforksOrdered, Transaction, ETH_DATA_FORMAT } from 'web3-types';
-import { Web3ValidatorError, isNullish, validator } from 'web3-validator';
-import { InvalidPropertiesForTransactionTypeError } from 'web3-errors';
+import { format, toHex } from '@etn-sc/web3-utils';
+import { TransactionTypeParser, Web3Context } from '@etn-sc/web3-core';
+import { EthExecutionAPI, HardforksOrdered, Transaction, ETH_DATA_FORMAT } from '@etn-sc/web3-types';
+import { Web3ValidatorError, isNullish, validator } from '@etn-sc/web3-validator';
+import { InvalidPropertiesForTransactionTypeError } from '@etn-sc/web3-errors';
 
 import { InternalTransaction } from '../types.js';
 
diff --git a/packages/web3-eth/src/utils/format_transaction.ts b/packages/web3-eth/src/utils/format_transaction.ts
index 5333254db60..31c78ee44d8 100644
--- a/packages/web3-eth/src/utils/format_transaction.ts
+++ b/packages/web3-eth/src/utils/format_transaction.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Transaction, DataFormat, DEFAULT_RETURN_FORMAT, FormatType } from 'web3-types';
-import { isNullish, ValidationSchemaInput } from 'web3-validator';
-import { mergeDeep, format, bytesToHex, toHex } from 'web3-utils';
-import { TransactionDataAndInputError } from 'web3-errors';
+import { Transaction, DataFormat, DEFAULT_RETURN_FORMAT, FormatType } from '@etn-sc/web3-types';
+import { isNullish, ValidationSchemaInput } from '@etn-sc/web3-validator';
+import { mergeDeep, format, bytesToHex, toHex } from '@etn-sc/web3-utils';
+import { TransactionDataAndInputError } from '@etn-sc/web3-errors';
 
 import { transactionInfoSchema, transactionSchema } from '../schemas.js';
 
diff --git a/packages/web3-eth/src/utils/get_revert_reason.ts b/packages/web3-eth/src/utils/get_revert_reason.ts
index 4b4b7d596a9..220eeb2651c 100644
--- a/packages/web3-eth/src/utils/get_revert_reason.ts
+++ b/packages/web3-eth/src/utils/get_revert_reason.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
-import { ContractExecutionError, Eip838ExecutionError, InvalidResponseError } from 'web3-errors';
-import { decodeContractErrorData, isAbiErrorFragment } from 'web3-eth-abi';
+import { Web3Context } from '@etn-sc/web3-core';
+import { ContractExecutionError, Eip838ExecutionError, InvalidResponseError } from '@etn-sc/web3-errors';
+import { decodeContractErrorData, isAbiErrorFragment } from '@etn-sc/web3-eth-abi';
 import {
 	AbiErrorFragment,
 	ContractAbi,
@@ -25,7 +25,7 @@ import {
 	DEFAULT_RETURN_FORMAT,
 	EthExecutionAPI,
 	TransactionCall,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 // eslint-disable-next-line import/no-cycle
 import { call } from '../rpc_method_wrappers.js';
diff --git a/packages/web3-eth/src/utils/get_transaction_error.ts b/packages/web3-eth/src/utils/get_transaction_error.ts
index 4cb0f520937..ff264508a53 100644
--- a/packages/web3-eth/src/utils/get_transaction_error.ts
+++ b/packages/web3-eth/src/utils/get_transaction_error.ts
@@ -15,19 +15,19 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 import {
 	TransactionRevertedWithoutReasonError,
 	TransactionRevertInstructionError,
 	TransactionRevertWithCustomError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import {
 	DataFormat,
 	FormatType,
 	ContractAbi,
 	TransactionCall,
 	TransactionReceipt,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { RevertReason, RevertReasonWithCustomError } from '../types.js';
 // eslint-disable-next-line import/no-cycle
 import { getRevertReason, parseTransactionError } from './get_revert_reason.js';
diff --git a/packages/web3-eth/src/utils/get_transaction_gas_pricing.ts b/packages/web3-eth/src/utils/get_transaction_gas_pricing.ts
index e5bbcdedfd4..101e0f6db16 100644
--- a/packages/web3-eth/src/utils/get_transaction_gas_pricing.ts
+++ b/packages/web3-eth/src/utils/get_transaction_gas_pricing.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 import {
 	EthExecutionAPI,
 	Numbers,
@@ -23,10 +23,10 @@ import {
 	DataFormat,
 	FormatType,
 	ETH_DATA_FORMAT,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { Eip1559NotSupportedError, UnsupportedTransactionTypeError } from 'web3-errors';
-import { format } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { Eip1559NotSupportedError, UnsupportedTransactionTypeError } from '@etn-sc/web3-errors';
+import { format } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-cycle
 import { getBlock, getGasPrice } from '../rpc_method_wrappers.js';
 import { InternalTransaction } from '../types.js';
diff --git a/packages/web3-eth/src/utils/prepare_transaction_for_signing.ts b/packages/web3-eth/src/utils/prepare_transaction_for_signing.ts
index 42072d2d9a9..f4b1cb12227 100644
--- a/packages/web3-eth/src/utils/prepare_transaction_for_signing.ts
+++ b/packages/web3-eth/src/utils/prepare_transaction_for_signing.ts
@@ -25,11 +25,11 @@ import {
 	ValidChains,
 	FormatType,
 	ETH_DATA_FORMAT,
-} from 'web3-types';
-import { Web3Context } from 'web3-core';
-import { toNumber } from 'web3-utils';
-import { TransactionFactory, TxOptions, Common } from 'web3-eth-accounts';
-import { isNullish } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { toNumber } from '@etn-sc/web3-utils';
+import { TransactionFactory, TxOptions, Common } from '@etn-sc/web3-eth-accounts';
+import { isNullish } from '@etn-sc/web3-validator';
 import { validateTransactionForSigning } from '../validation.js';
 import { formatTransaction } from './format_transaction.js';
 import { transactionBuilder } from './transaction_builder.js';
diff --git a/packages/web3-eth/src/utils/reject_if_block_timeout.ts b/packages/web3-eth/src/utils/reject_if_block_timeout.ts
index 2019ce3380d..26af39e9833 100644
--- a/packages/web3-eth/src/utils/reject_if_block_timeout.ts
+++ b/packages/web3-eth/src/utils/reject_if_block_timeout.ts
@@ -14,11 +14,11 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { EthExecutionAPI, Bytes, Web3BaseProvider, BlockHeaderOutput } from 'web3-types';
-import { Web3Context } from 'web3-core';
-import { rejectIfConditionAtInterval } from 'web3-utils';
+import { EthExecutionAPI, Bytes, Web3BaseProvider, BlockHeaderOutput } from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { rejectIfConditionAtInterval } from '@etn-sc/web3-utils';
 
-import { TransactionBlockTimeoutError } from 'web3-errors';
+import { TransactionBlockTimeoutError } from '@etn-sc/web3-errors';
 import { NUMBER_DATA_FORMAT } from '../constants.js';
 // eslint-disable-next-line import/no-cycle
 import { getBlockNumber } from '../rpc_method_wrappers.js';
diff --git a/packages/web3-eth/src/utils/send_tx_helper.ts b/packages/web3-eth/src/utils/send_tx_helper.ts
index 3cc767449b6..e51bce8748a 100644
--- a/packages/web3-eth/src/utils/send_tx_helper.ts
+++ b/packages/web3-eth/src/utils/send_tx_helper.ts
@@ -31,17 +31,17 @@ import {
 	LogsInput,
 	TransactionHash,
 	ContractAbiWithSignature,
-} from 'web3-types';
-import { Web3Context, Web3EventEmitter, Web3PromiEvent } from 'web3-core';
-import { isNullish } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { Web3Context, Web3EventEmitter, Web3PromiEvent } from '@etn-sc/web3-core';
+import { isNullish } from '@etn-sc/web3-validator';
 import {
 	ContractExecutionError,
 	InvalidResponseError,
 	TransactionRevertedWithoutReasonError,
 	TransactionRevertInstructionError,
 	TransactionRevertWithCustomError,
-} from 'web3-errors';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-errors';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import {
 	SendSignedTransactionEvents,
diff --git a/packages/web3-eth/src/utils/transaction_builder.ts b/packages/web3-eth/src/utils/transaction_builder.ts
index 13edd253330..db7ce24330e 100644
--- a/packages/web3-eth/src/utils/transaction_builder.ts
+++ b/packages/web3-eth/src/utils/transaction_builder.ts
@@ -32,19 +32,19 @@ import {
 	DEFAULT_RETURN_FORMAT,
 	FormatType,
 	ETH_DATA_FORMAT,
-} from 'web3-types';
-import { Web3Context } from 'web3-core';
-import { privateKeyToAddress } from 'web3-eth-accounts';
-import { getId } from 'web3-net';
-import { isNullish, isNumber, isHexStrict, isAddress } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { privateKeyToAddress } from '@etn-sc/web3-eth-accounts';
+import { getId } from '@etn-sc/web3-net';
+import { isNullish, isNumber, isHexStrict, isAddress } from '@etn-sc/web3-validator';
 import {
 	InvalidTransactionWithSender,
 	InvalidTransactionWithReceiver,
 	LocalWalletNotAvailableError,
 	TransactionDataAndInputError,
 	UnableToPopulateNonceError,
-} from 'web3-errors';
-import { bytesToHex, format } from 'web3-utils';
+} from '@etn-sc/web3-errors';
+import { bytesToHex, format } from '@etn-sc/web3-utils';
 import { NUMBER_DATA_FORMAT } from '../constants.js';
 // eslint-disable-next-line import/no-cycle
 import { getChainId, getTransactionCount, estimateGas } from '../rpc_method_wrappers.js';
diff --git a/packages/web3-eth/src/utils/try_send_transaction.ts b/packages/web3-eth/src/utils/try_send_transaction.ts
index b3a677c6270..795b614b1f6 100644
--- a/packages/web3-eth/src/utils/try_send_transaction.ts
+++ b/packages/web3-eth/src/utils/try_send_transaction.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { EthExecutionAPI, Bytes } from 'web3-types';
-import { AsyncFunction, rejectIfTimeout } from 'web3-utils';
-import { TransactionSendTimeoutError } from 'web3-errors';
+import { Web3Context } from '@etn-sc/web3-core';
+import { EthExecutionAPI, Bytes } from '@etn-sc/web3-types';
+import { AsyncFunction, rejectIfTimeout } from '@etn-sc/web3-utils';
+import { TransactionSendTimeoutError } from '@etn-sc/web3-errors';
 
 // eslint-disable-next-line import/no-cycle
 import { rejectIfBlockTimeout } from './reject_if_block_timeout.js';
diff --git a/packages/web3-eth/src/utils/wait_for_transaction_receipt.ts b/packages/web3-eth/src/utils/wait_for_transaction_receipt.ts
index d335683391e..b3cab7541a4 100644
--- a/packages/web3-eth/src/utils/wait_for_transaction_receipt.ts
+++ b/packages/web3-eth/src/utils/wait_for_transaction_receipt.ts
@@ -15,12 +15,12 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
-import { TransactionPollingTimeoutError } from 'web3-errors';
-import { EthExecutionAPI, Bytes, TransactionReceipt, DataFormat } from 'web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { TransactionPollingTimeoutError } from '@etn-sc/web3-errors';
+import { EthExecutionAPI, Bytes, TransactionReceipt, DataFormat } from '@etn-sc/web3-types';
 
 // eslint-disable-next-line import/no-cycle
-import { pollTillDefinedAndReturnIntervalId, rejectIfTimeout } from 'web3-utils';
+import { pollTillDefinedAndReturnIntervalId, rejectIfTimeout } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-cycle
 import { rejectIfBlockTimeout } from './reject_if_block_timeout.js';
 // eslint-disable-next-line import/no-cycle
diff --git a/packages/web3-eth/src/utils/watch_transaction_by_pooling.ts b/packages/web3-eth/src/utils/watch_transaction_by_pooling.ts
index 6be3c572742..2755607c1c2 100644
--- a/packages/web3-eth/src/utils/watch_transaction_by_pooling.ts
+++ b/packages/web3-eth/src/utils/watch_transaction_by_pooling.ts
@@ -14,12 +14,12 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, EthExecutionAPI, TransactionReceipt } from 'web3-types';
-import { Web3Context, Web3PromiEvent } from 'web3-core';
-import { format, numberToHex } from 'web3-utils';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Bytes, EthExecutionAPI, TransactionReceipt } from '@etn-sc/web3-types';
+import { Web3Context, Web3PromiEvent } from '@etn-sc/web3-core';
+import { format, numberToHex } from '@etn-sc/web3-utils';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
-import { DataFormat } from 'web3-types';
+import { DataFormat } from '@etn-sc/web3-types';
 import { SendSignedTransactionEvents, SendTransactionEvents } from '../types.js';
 import { transactionReceiptSchema } from '../schemas.js';
 
diff --git a/packages/web3-eth/src/utils/watch_transaction_by_subscription.ts b/packages/web3-eth/src/utils/watch_transaction_by_subscription.ts
index 8cdaa8fc214..cfeed85b6de 100644
--- a/packages/web3-eth/src/utils/watch_transaction_by_subscription.ts
+++ b/packages/web3-eth/src/utils/watch_transaction_by_subscription.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, Numbers, BlockHeaderOutput, TransactionReceipt } from 'web3-types';
-import { format } from 'web3-utils';
+import { Bytes, Numbers, BlockHeaderOutput, TransactionReceipt } from '@etn-sc/web3-types';
+import { format } from '@etn-sc/web3-utils';
 
-import { DataFormat } from 'web3-types';
+import { DataFormat } from '@etn-sc/web3-types';
 import { NewHeadsSubscription } from '../web3_subscriptions.js';
 import { transactionReceiptSchema } from '../schemas.js';
 import { WaitProps, watchTransactionByPolling } from './watch_transaction_by_pooling.js';
diff --git a/packages/web3-eth/src/utils/watch_transaction_for_confirmations.ts b/packages/web3-eth/src/utils/watch_transaction_for_confirmations.ts
index e6826fea10d..b717a5b876e 100644
--- a/packages/web3-eth/src/utils/watch_transaction_for_confirmations.ts
+++ b/packages/web3-eth/src/utils/watch_transaction_for_confirmations.ts
@@ -14,16 +14,16 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, EthExecutionAPI, Web3BaseProvider, TransactionReceipt } from 'web3-types';
-import { Web3Context, Web3PromiEvent } from 'web3-core';
-import { format } from 'web3-utils';
-import { isNullish } from 'web3-validator';
+import { Bytes, EthExecutionAPI, Web3BaseProvider, TransactionReceipt } from '@etn-sc/web3-types';
+import { Web3Context, Web3PromiEvent } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { isNullish } from '@etn-sc/web3-validator';
 
 import {
 	TransactionMissingReceiptOrBlockHashError,
 	TransactionReceiptMissingBlockNumberError,
-} from 'web3-errors';
-import { DataFormat } from 'web3-types';
+} from '@etn-sc/web3-errors';
+import { DataFormat } from '@etn-sc/web3-types';
 import { transactionReceiptSchema } from '../schemas.js';
 import {
 	watchTransactionByPolling,
diff --git a/packages/web3-eth/src/validation.ts b/packages/web3-eth/src/validation.ts
index a818cc66c10..1c2f90df7fa 100644
--- a/packages/web3-eth/src/validation.ts
+++ b/packages/web3-eth/src/validation.ts
@@ -26,8 +26,8 @@ import {
 	Transaction,
 	TransactionWithSenderAPI,
 	ETH_DATA_FORMAT,
-} from 'web3-types';
-import { isAddress, isHexStrict, isHexString32Bytes, isNullish, isUInt } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { isAddress, isHexStrict, isHexString32Bytes, isNullish, isUInt } from '@etn-sc/web3-validator';
 import {
 	ChainMismatchError,
 	HardforkMismatchError,
@@ -46,7 +46,7 @@ import {
 	MissingGasError,
 	TransactionGasMismatchError,
 	UnsupportedFeeMarketError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import { formatTransaction } from './utils/format_transaction.js';
 import { InternalTransaction } from './types.js';
 
diff --git a/packages/web3-eth/src/web3_eth.ts b/packages/web3-eth/src/web3_eth.ts
index c4b3b6a92f8..6209f751987 100644
--- a/packages/web3-eth/src/web3_eth.ts
+++ b/packages/web3-eth/src/web3_eth.ts
@@ -38,11 +38,11 @@ import {
 	DataFormat,
 	DEFAULT_RETURN_FORMAT,
 	Eip712TypedData,
-} from 'web3-types';
-import { isSupportedProvider, Web3Context, Web3ContextInitOptions } from 'web3-core';
-import { TransactionNotFound } from 'web3-errors';
-import { toChecksumAddress, isNullish } from 'web3-utils';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isSupportedProvider, Web3Context, Web3ContextInitOptions } from '@etn-sc/web3-core';
+import { TransactionNotFound } from '@etn-sc/web3-errors';
+import { toChecksumAddress, isNullish } from '@etn-sc/web3-utils';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import * as rpcMethodsWrappers from './rpc_method_wrappers.js';
 import { SendTransactionOptions } from './types.js';
diff --git a/packages/web3-eth/src/web3_subscriptions.ts b/packages/web3-eth/src/web3_subscriptions.ts
index 5838aa9ce2d..5ad17ba8fe9 100644
--- a/packages/web3-eth/src/web3_subscriptions.ts
+++ b/packages/web3-eth/src/web3_subscriptions.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable-next-line max-classes-per-file */
-import { format } from 'web3-utils';
+import { format } from '@etn-sc/web3-utils';
 
 import {
 	SyncOutput,
@@ -25,8 +25,8 @@ import {
 	Topic,
 	BlockHeaderOutput,
 	LogsOutput,
-} from 'web3-types';
-import { Web3Subscription } from 'web3-core';
+} from '@etn-sc/web3-types';
+import { Web3Subscription } from '@etn-sc/web3-core';
 import { blockHeaderSchema, logSchema, syncSchema } from './schemas.js';
 
 /**
diff --git a/packages/web3-eth/test/e2e/subscription_new_heads.test.ts b/packages/web3-eth/test/e2e/subscription_new_heads.test.ts
index 01bb6b5fc4e..88c65ff0288 100644
--- a/packages/web3-eth/test/e2e/subscription_new_heads.test.ts
+++ b/packages/web3-eth/test/e2e/subscription_new_heads.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3, { BlockHeaderOutput } from 'web3';
+import Web3, { BlockHeaderOutput } from '@etn-sc/web3';
 
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/fixtures/decoding.ts b/packages/web3-eth/test/fixtures/decoding.ts
index e548f33acc6..9b9a11ff50d 100644
--- a/packages/web3-eth/test/fixtures/decoding.ts
+++ b/packages/web3-eth/test/fixtures/decoding.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiEventFragment, LogsInput } from 'web3-types';
+import { AbiEventFragment, LogsInput } from '@etn-sc/web3-types';
 
 export const decodeEventABIData: [AbiEventFragment & { signature: string }, LogsInput, any][] = [
 	[
diff --git a/packages/web3-eth/test/fixtures/detect_transaction_type.ts b/packages/web3-eth/test/fixtures/detect_transaction_type.ts
index bd957462cfb..3d444dbe58f 100644
--- a/packages/web3-eth/test/fixtures/detect_transaction_type.ts
+++ b/packages/web3-eth/test/fixtures/detect_transaction_type.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ETH_DATA_FORMAT, FormatType, Transaction } from 'web3-types';
+import { ETH_DATA_FORMAT, FormatType, Transaction } from '@etn-sc/web3-types';
 
 export const transactionType0x0: FormatType<Transaction, typeof ETH_DATA_FORMAT>[] = [
 	{
diff --git a/packages/web3-eth/test/fixtures/example_subscription.ts b/packages/web3-eth/test/fixtures/example_subscription.ts
index ceb1f101469..aea3c3b9db9 100644
--- a/packages/web3-eth/test/fixtures/example_subscription.ts
+++ b/packages/web3-eth/test/fixtures/example_subscription.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Subscription } from 'web3-core';
+import { Web3Subscription } from '@etn-sc/web3-core';
 
 export class NewHeadsSubscription extends Web3Subscription<
 	{ data: string },
diff --git a/packages/web3-eth/test/fixtures/format_transaction.ts b/packages/web3-eth/test/fixtures/format_transaction.ts
index dc91dc7c823..6c06f9ad101 100644
--- a/packages/web3-eth/test/fixtures/format_transaction.ts
+++ b/packages/web3-eth/test/fixtures/format_transaction.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { FormatType, Transaction, DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { FormatType, Transaction, DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const bytesAsHexStringTransaction: FormatType<
 	Transaction,
diff --git a/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts b/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts
index dd03a74bcde..726b4ec43f6 100644
--- a/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts
+++ b/packages/web3-eth/test/fixtures/prepare_transaction_for_signing.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AccessList, Block, HexString, Common, Transaction } from 'web3-types';
+import { AccessList, Block, HexString, Common, Transaction } from '@etn-sc/web3-types';
 
 export const preEip1559Block: Block = {
 	parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
diff --git a/packages/web3-eth/test/fixtures/rpc_methods_wrappers.ts b/packages/web3-eth/test/fixtures/rpc_methods_wrappers.ts
index 02f877d9988..516aed863f5 100644
--- a/packages/web3-eth/test/fixtures/rpc_methods_wrappers.ts
+++ b/packages/web3-eth/test/fixtures/rpc_methods_wrappers.ts
@@ -22,7 +22,7 @@ import {
 	Numbers,
 	Uint,
 	TransactionWithSenderAPI,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 // Array consists of: returnType parameter, mock RPC result, expected output
 export const getHashRateValidData: [DataFormat, Numbers, Numbers][] = [
diff --git a/packages/web3-eth/test/fixtures/validate_transaction_for_signing.ts b/packages/web3-eth/test/fixtures/validate_transaction_for_signing.ts
index f22d5ac60cc..57c634b631b 100644
--- a/packages/web3-eth/test/fixtures/validate_transaction_for_signing.ts
+++ b/packages/web3-eth/test/fixtures/validate_transaction_for_signing.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Transaction, FMT_BYTES, FMT_NUMBER, FormatType } from 'web3-types';
+import { Transaction, FMT_BYTES, FMT_NUMBER, FormatType } from '@etn-sc/web3-types';
 import {
 	ChainIdMismatchError,
 	CommonOrChainAndHardforkError,
@@ -29,7 +29,7 @@ import {
 	MissingGasError,
 	TransactionGasMismatchError,
 	UnsupportedFeeMarketError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 export const invalidTransactionObject: any[] = ['42', false, '0x0', BigInt(42), () => {}];
diff --git a/packages/web3-eth/test/fixtures/validation.ts b/packages/web3-eth/test/fixtures/validation.ts
index 115e198ae1f..9619dea9f9c 100644
--- a/packages/web3-eth/test/fixtures/validation.ts
+++ b/packages/web3-eth/test/fixtures/validation.ts
@@ -24,8 +24,8 @@ import {
 	TransactionLegacyUnsignedAPI,
 	TransactionCall,
 	TransactionWithSenderAPI,
-} from 'web3-types';
-import { InvalidTransactionCall, InvalidTransactionWithSender } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { InvalidTransactionCall, InvalidTransactionWithSender } from '@etn-sc/web3-errors';
 
 export const isBaseTransactionValidData: [BaseTransactionAPI, true][] = [
 	[
diff --git a/packages/web3-eth/test/fixtures/web3_eth_methods_with_parameters.ts b/packages/web3-eth/test/fixtures/web3_eth_methods_with_parameters.ts
index 17d9c204f21..d09709c6c4c 100644
--- a/packages/web3-eth/test/fixtures/web3_eth_methods_with_parameters.ts
+++ b/packages/web3-eth/test/fixtures/web3_eth_methods_with_parameters.ts
@@ -30,7 +30,7 @@ import {
 	Uint256,
 	TransactionWithSenderAPI,
 	TransactionReceipt,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { transactionWithSender } from './rpc_methods_wrappers';
 
 /**
diff --git a/packages/web3-eth/test/integration/batch.test.ts b/packages/web3-eth/test/integration/batch.test.ts
index a71f02be43b..52f56a7c227 100644
--- a/packages/web3-eth/test/integration/batch.test.ts
+++ b/packages/web3-eth/test/integration/batch.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { SupportedProviders } from 'web3-types';
-import { hexToNumber } from 'web3-utils';
+import { SupportedProviders } from '@etn-sc/web3-types';
+import { hexToNumber } from '@etn-sc/web3-utils';
 import { Web3Eth } from '../../src';
 
 import {
diff --git a/packages/web3-eth/test/integration/block/rpc.getBlock.test.ts b/packages/web3-eth/test/integration/block/rpc.getBlock.test.ts
index ff1bf928f17..83c3d33c97f 100644
--- a/packages/web3-eth/test/integration/block/rpc.getBlock.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getBlock.test.ts
@@ -20,10 +20,10 @@ import {
 	FMT_BYTES,
 	FMT_NUMBER,
 	SupportedProviders,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
-import { validator } from 'web3-validator';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { validator } from '@etn-sc/web3-validator';
 import { Web3Eth } from '../../../src';
 import {
 	getSystemTestProvider,
diff --git a/packages/web3-eth/test/integration/block/rpc.getBlockTransactionCount.test.ts b/packages/web3-eth/test/integration/block/rpc.getBlockTransactionCount.test.ts
index 0782d5b02ed..9ee993ed2ba 100644
--- a/packages/web3-eth/test/integration/block/rpc.getBlockTransactionCount.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getBlockTransactionCount.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionReceipt } from 'web3-types';
+import { SupportedProviders, TransactionReceipt } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 import { Web3Eth } from '../../../src';
 import {
 	getSystemTestBackend,
diff --git a/packages/web3-eth/test/integration/block/rpc.getBlockUncleCount.test.ts b/packages/web3-eth/test/integration/block/rpc.getBlockUncleCount.test.ts
index 3c8902665fc..59ab12f6e60 100644
--- a/packages/web3-eth/test/integration/block/rpc.getBlockUncleCount.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getBlockUncleCount.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionReceipt } from 'web3-types';
+import { SupportedProviders, TransactionReceipt } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 import { Web3Eth } from '../../../src';
 import {
 	getSystemTestProvider,
diff --git a/packages/web3-eth/test/integration/block/rpc.getTransactionCount.test.ts b/packages/web3-eth/test/integration/block/rpc.getTransactionCount.test.ts
index 26bf386dba9..a66966f13bf 100644
--- a/packages/web3-eth/test/integration/block/rpc.getTransactionCount.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getTransactionCount.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionReceipt, FMT_BYTES, FMT_NUMBER } from 'web3-types';
+import { SupportedProviders, TransactionReceipt, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 import { Web3Eth } from '../../../src';
 import {
 	getSystemTestProvider,
diff --git a/packages/web3-eth/test/integration/block/rpc.getTransactionFromBlock.test.ts b/packages/web3-eth/test/integration/block/rpc.getTransactionFromBlock.test.ts
index 13777425e8c..cedccf596e7 100644
--- a/packages/web3-eth/test/integration/block/rpc.getTransactionFromBlock.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getTransactionFromBlock.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionInfo, TransactionReceipt } from 'web3-types';
+import { SupportedProviders, TransactionInfo, TransactionReceipt } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 import { Web3Eth } from '../../../src';
 import {
 	getSystemTestProvider,
diff --git a/packages/web3-eth/test/integration/block/rpc.getUncle.test.ts b/packages/web3-eth/test/integration/block/rpc.getUncle.test.ts
index 4ba7f08a91d..9c66495799c 100644
--- a/packages/web3-eth/test/integration/block/rpc.getUncle.test.ts
+++ b/packages/web3-eth/test/integration/block/rpc.getUncle.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionReceipt } from 'web3-types';
+import { SupportedProviders, TransactionReceipt } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 
 import { Web3Eth } from '../../../src';
 
diff --git a/packages/web3-eth/test/integration/defaults.test.ts b/packages/web3-eth/test/integration/defaults.test.ts
index 3a17d9449de..84d652fb0ef 100644
--- a/packages/web3-eth/test/integration/defaults.test.ts
+++ b/packages/web3-eth/test/integration/defaults.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
-import { hexToNumber, numberToHex } from 'web3-utils';
-import { TransactionBuilder, TransactionTypeParser, Web3Context, Web3PromiEvent } from 'web3-core';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { hexToNumber, numberToHex } from '@etn-sc/web3-utils';
+import { TransactionBuilder, TransactionTypeParser, Web3Context, Web3PromiEvent } from '@etn-sc/web3-core';
 import {
 	Hardfork,
 	SupportedProviders,
@@ -25,7 +25,7 @@ import {
 	ValidChains,
 	Web3BaseProvider,
 	DEFAULT_RETURN_FORMAT,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import {
 	detectTransactionType,
 	prepareTransactionForSigning,
diff --git a/packages/web3-eth/test/integration/defaults.transactionBlockTimeout.test.ts b/packages/web3-eth/test/integration/defaults.transactionBlockTimeout.test.ts
index d547c2bc551..2f19c7651e6 100644
--- a/packages/web3-eth/test/integration/defaults.transactionBlockTimeout.test.ts
+++ b/packages/web3-eth/test/integration/defaults.transactionBlockTimeout.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
-import { Web3PromiEvent } from 'web3-core';
-import { SupportedProviders, TransactionReceipt } from 'web3-types';
-import { TransactionBlockTimeoutError } from 'web3-errors';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+import { Web3PromiEvent } from '@etn-sc/web3-core';
+import { SupportedProviders, TransactionReceipt } from '@etn-sc/web3-types';
+import { TransactionBlockTimeoutError } from '@etn-sc/web3-errors';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3 } from 'web3';
-import { Web3Account } from 'web3-eth-accounts';
+import { Web3 } from '@etn-sc/web3';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import { SendTransactionEvents } from '../../src';
 
 import {
diff --git a/packages/web3-eth/test/integration/eth.test.ts b/packages/web3-eth/test/integration/eth.test.ts
index 99a096b40aa..35e78436988 100644
--- a/packages/web3-eth/test/integration/eth.test.ts
+++ b/packages/web3-eth/test/integration/eth.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import WebSocketProvider from 'web3-providers-ws';
-import HttpProvider from 'web3-providers-http';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
+import HttpProvider from '@etn-sc/web3-providers-http';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract } from 'web3-eth-contract';
+import { Contract } from '@etn-sc/web3-eth-contract';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { SupportedProviders } from 'web3-types';
+import { SupportedProviders } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { Web3Eth } from '../../src';
 
 import {
diff --git a/packages/web3-eth/test/integration/get_revert_reason.test.ts b/packages/web3-eth/test/integration/get_revert_reason.test.ts
index 9c7977c0fe4..fd9a129ca18 100644
--- a/packages/web3-eth/test/integration/get_revert_reason.test.ts
+++ b/packages/web3-eth/test/integration/get_revert_reason.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable jest/no-conditional-expect */
 
-import { Address, Transaction, TransactionCall } from 'web3-types';
+import { Address, Transaction, TransactionCall } from '@etn-sc/web3-types';
 
 import Web3Eth from '../../src';
 import { getRevertReason } from '../../src/utils/get_revert_reason';
diff --git a/packages/web3-eth/test/integration/helper.ts b/packages/web3-eth/test/integration/helper.ts
index 46063294702..5820ffde95b 100644
--- a/packages/web3-eth/test/integration/helper.ts
+++ b/packages/web3-eth/test/integration/helper.ts
@@ -20,9 +20,9 @@ import {
 	TransactionInfo,
 	TransactionReceipt,
 	FMT_NUMBER,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 import { BasicAbi } from '../shared_fixtures/build/Basic';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/nonce.test.ts b/packages/web3-eth/test/integration/nonce.test.ts
index 806db34985f..7534b812bb1 100644
--- a/packages/web3-eth/test/integration/nonce.test.ts
+++ b/packages/web3-eth/test/integration/nonce.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionPollingTimeoutError, TransactionSendTimeoutError } from 'web3-errors';
+import { TransactionPollingTimeoutError, TransactionSendTimeoutError } from '@etn-sc/web3-errors';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { SupportedProviders, Web3 } from 'web3';
-import { Web3Account } from 'web3-eth-accounts';
+import { SupportedProviders, Web3 } from '@etn-sc/web3';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import { Web3Eth } from '../../src';
 
 import {
diff --git a/packages/web3-eth/test/integration/rpc.test.ts b/packages/web3-eth/test/integration/rpc.test.ts
index c8d8d68d34a..5ae47d6b47a 100644
--- a/packages/web3-eth/test/integration/rpc.test.ts
+++ b/packages/web3-eth/test/integration/rpc.test.ts
@@ -22,10 +22,10 @@ import {
 	SupportedProviders,
 	FMT_BYTES,
 	FMT_NUMBER,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract, decodeEventABI } from 'web3-eth-contract';
-import { hexToNumber, hexToString, numberToHex, getStorageSlotNumForLongString } from 'web3-utils';
+import { Contract, decodeEventABI } from '@etn-sc/web3-eth-contract';
+import { hexToNumber, hexToString, numberToHex, getStorageSlotNumForLongString } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { Web3Eth } from '../../src';
 
diff --git a/packages/web3-eth/test/integration/subscribe.test.ts b/packages/web3-eth/test/integration/subscribe.test.ts
index 9c6fc04b05b..8499e3a5d69 100644
--- a/packages/web3-eth/test/integration/subscribe.test.ts
+++ b/packages/web3-eth/test/integration/subscribe.test.ts
@@ -14,11 +14,11 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import WebSocketProvider from 'web3-providers-ws';
-import { Web3BaseProvider } from 'web3-types';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
+import { Web3BaseProvider } from '@etn-sc/web3-types';
 /* eslint-disable import/no-named-as-default */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import Web3Eth, {
 	LogsSubscription,
 	NewHeadsSubscription,
diff --git a/packages/web3-eth/test/integration/subscription_heads.test.ts b/packages/web3-eth/test/integration/subscription_heads.test.ts
index c801e5e83ef..6008254d600 100644
--- a/packages/web3-eth/test/integration/subscription_heads.test.ts
+++ b/packages/web3-eth/test/integration/subscription_heads.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockHeaderOutput, SupportedProviders } from 'web3-types';
+import { BlockHeaderOutput, SupportedProviders } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3 } from 'web3';
+import { Web3 } from '@etn-sc/web3';
 import { Web3Eth, NewHeadsSubscription } from '../../src';
 import { Resolve } from './helper';
 import {
diff --git a/packages/web3-eth/test/integration/subscription_logs.test.ts b/packages/web3-eth/test/integration/subscription_logs.test.ts
index 748aadab99c..60166bd7877 100644
--- a/packages/web3-eth/test/integration/subscription_logs.test.ts
+++ b/packages/web3-eth/test/integration/subscription_logs.test.ts
@@ -14,12 +14,12 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import WebSocketProvider from 'web3-providers-ws';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract, decodeEventABI } from 'web3-eth-contract';
-import { AbiEventFragment, Web3BaseProvider } from 'web3-types';
+import { Contract, decodeEventABI } from '@etn-sc/web3-eth-contract';
+import { AbiEventFragment, Web3BaseProvider } from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { Web3Eth } from '../../src';
 import { LogsSubscription } from '../../src/web3_subscriptions';
 import {
diff --git a/packages/web3-eth/test/integration/subscription_logs_block.test.ts b/packages/web3-eth/test/integration/subscription_logs_block.test.ts
index 0509224d90e..94c9f4ae785 100644
--- a/packages/web3-eth/test/integration/subscription_logs_block.test.ts
+++ b/packages/web3-eth/test/integration/subscription_logs_block.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import WebSocketProvider from 'web3-providers-ws';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Contract, decodeEventABI } from 'web3-eth-contract';
-import { AbiEventFragment, Web3BaseProvider } from 'web3-types';
-import { numberToHex } from 'web3-utils';
+import { Contract, decodeEventABI } from '@etn-sc/web3-eth-contract';
+import { AbiEventFragment, Web3BaseProvider } from '@etn-sc/web3-types';
+import { numberToHex } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import { Web3Eth } from '../../src';
 import { LogsSubscription } from '../../src/web3_subscriptions';
 import {
diff --git a/packages/web3-eth/test/integration/subscription_new_pending_tx.test.ts b/packages/web3-eth/test/integration/subscription_new_pending_tx.test.ts
index 86e20626d6f..1f8f04679bf 100644
--- a/packages/web3-eth/test/integration/subscription_new_pending_tx.test.ts
+++ b/packages/web3-eth/test/integration/subscription_new_pending_tx.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3 } from 'web3';
+import { Web3 } from '@etn-sc/web3';
 import { Web3Eth, NewPendingTransactionsSubscription } from '../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/subscription_on_2_events.test.ts b/packages/web3-eth/test/integration/subscription_on_2_events.test.ts
index bfcfb99da92..84f980ff422 100644
--- a/packages/web3-eth/test/integration/subscription_on_2_events.test.ts
+++ b/packages/web3-eth/test/integration/subscription_on_2_events.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { BlockHeaderOutput, Web3 } from 'web3';
+import { BlockHeaderOutput, Web3 } from '@etn-sc/web3';
 import {
 	closeOpenConnection,
 	describeIf,
diff --git a/packages/web3-eth/test/integration/unsubscribe.test.ts b/packages/web3-eth/test/integration/unsubscribe.test.ts
index 4c74e10eb25..ba003f9179b 100644
--- a/packages/web3-eth/test/integration/unsubscribe.test.ts
+++ b/packages/web3-eth/test/integration/unsubscribe.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import WebSocketProvider from 'web3-providers-ws';
-import { Web3BaseProvider } from 'web3-types';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
+import { Web3BaseProvider } from '@etn-sc/web3-types';
 /* eslint-disable  import/no-extraneous-dependencies */
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import Web3Eth from '../../src/index';
 import { NewHeadsSubscription, SyncingSubscription } from '../../src/web3_subscriptions';
 import {
diff --git a/packages/web3-eth/test/integration/watch_transaction.test.ts b/packages/web3-eth/test/integration/watch_transaction.test.ts
index 4aa607c8fdd..94a3c0e6847 100644
--- a/packages/web3-eth/test/integration/watch_transaction.test.ts
+++ b/packages/web3-eth/test/integration/watch_transaction.test.ts
@@ -14,11 +14,11 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SupportedProviders, TransactionReceipt, DEFAULT_RETURN_FORMAT } from 'web3-types';
-import { Web3PromiEvent } from 'web3-core';
-import { Web3Account } from 'web3-eth-accounts';
+import { SupportedProviders, TransactionReceipt, DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+import { Web3PromiEvent } from '@etn-sc/web3-core';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3 } from 'web3';
+import { Web3 } from '@etn-sc/web3';
 import { SendTransactionEvents } from '../../src';
 import {
 	getSystemTestProvider,
diff --git a/packages/web3-eth/test/integration/watch_transaction_polling.test.ts b/packages/web3-eth/test/integration/watch_transaction_polling.test.ts
index 3677120e125..4a510749a7e 100644
--- a/packages/web3-eth/test/integration/watch_transaction_polling.test.ts
+++ b/packages/web3-eth/test/integration/watch_transaction_polling.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
-import { Web3PromiEvent } from 'web3-core';
-import { SupportedProviders, TransactionReceipt } from 'web3-types';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+import { Web3PromiEvent } from '@etn-sc/web3-core';
+import { SupportedProviders, TransactionReceipt } from '@etn-sc/web3-types';
 import { Web3Eth, SendTransactionEvents } from '../../src';
 
 import {
diff --git a/packages/web3-eth/test/integration/web3_eth/call.test.ts b/packages/web3-eth/test/integration/web3_eth/call.test.ts
index 4f22a29876e..21834935f84 100644
--- a/packages/web3-eth/test/integration/web3_eth/call.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/call.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionCall, BlockTags, Transaction } from 'web3-types';
-import { decodeParameters } from 'web3-eth-abi';
+import { TransactionCall, BlockTags, Transaction } from '@etn-sc/web3-types';
+import { decodeParameters } from '@etn-sc/web3-eth-abi';
 import { Web3Eth } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/web3_eth/createAccessList.test.ts b/packages/web3-eth/test/integration/web3_eth/createAccessList.test.ts
index ae8ecc64f50..830f062980c 100644
--- a/packages/web3-eth/test/integration/web3_eth/createAccessList.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/createAccessList.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AccessListResult, Transaction, TransactionForAccessList } from 'web3-types';
+import { AccessListResult, Transaction, TransactionForAccessList } from '@etn-sc/web3-types';
 import { Web3Eth } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/web3_eth/estimate_gas.test.ts b/packages/web3-eth/test/integration/web3_eth/estimate_gas.test.ts
index 6e2b8fd67c7..e238a2801a2 100644
--- a/packages/web3-eth/test/integration/web3_eth/estimate_gas.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/estimate_gas.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Transaction } from 'web3-types';
+import { Transaction } from '@etn-sc/web3-types';
 import { Web3Eth } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/web3_eth/getFeeHistory.test.ts b/packages/web3-eth/test/integration/web3_eth/getFeeHistory.test.ts
index c33eab71452..a37fecb8c5a 100644
--- a/packages/web3-eth/test/integration/web3_eth/getFeeHistory.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/getFeeHistory.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, Numbers, SupportedProviders } from 'web3-types';
+import { BlockNumberOrTag, Numbers, SupportedProviders } from '@etn-sc/web3-types';
 
 import Web3Eth from '../../../src';
 import {
diff --git a/packages/web3-eth/test/integration/web3_eth/send_signed_transaction.test.ts b/packages/web3-eth/test/integration/web3_eth/send_signed_transaction.test.ts
index 550e59f9bc8..11acd4e48fd 100644
--- a/packages/web3-eth/test/integration/web3_eth/send_signed_transaction.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/send_signed_transaction.test.ts
@@ -27,9 +27,9 @@ import {
 	FMT_BYTES,
 	FMT_NUMBER,
 	DEFAULT_RETURN_FORMAT,
-} from 'web3-types';
-import { format, hexToNumber } from 'web3-utils';
-import { isHexStrict } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { format, hexToNumber } from '@etn-sc/web3-utils';
+import { isHexStrict } from '@etn-sc/web3-validator';
 import { Web3Eth, InternalTransaction, transactionSchema } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/web3_eth/send_transaction.test.ts b/packages/web3-eth/test/integration/web3_eth/send_transaction.test.ts
index 27be74bc7a9..2aa7d08ce89 100644
--- a/packages/web3-eth/test/integration/web3_eth/send_transaction.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/send_transaction.test.ts
@@ -26,9 +26,9 @@ import {
 	TransactionWithFromAndToLocalWalletIndex,
 	Address,
 	DEFAULT_RETURN_FORMAT,
-} from 'web3-types';
-import { Wallet } from 'web3-eth-accounts';
-import { isHexStrict } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { Wallet } from '@etn-sc/web3-eth-accounts';
+import { isHexStrict } from '@etn-sc/web3-validator';
 
 import Web3Eth from '../../../src';
 import {
diff --git a/packages/web3-eth/test/integration/web3_eth/sign.test.ts b/packages/web3-eth/test/integration/web3_eth/sign.test.ts
index d07ed4273b6..e59316d9e89 100644
--- a/packages/web3-eth/test/integration/web3_eth/sign.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/sign.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { isHexStrict } from 'web3-validator';
+import { isHexStrict } from '@etn-sc/web3-validator';
 
 import { Web3Eth } from '../../../src';
 import {
diff --git a/packages/web3-eth/test/integration/web3_eth/sign_transaction.test.ts b/packages/web3-eth/test/integration/web3_eth/sign_transaction.test.ts
index be0e09c1782..2982a0834bc 100644
--- a/packages/web3-eth/test/integration/web3_eth/sign_transaction.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/sign_transaction.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Transaction, TransactionLegacySignedAPI } from 'web3-types';
+import { Transaction, TransactionLegacySignedAPI } from '@etn-sc/web3-types';
 import { Web3Eth } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3-eth/test/integration/web3_eth/sign_typed_data.test.ts b/packages/web3-eth/test/integration/web3_eth/sign_typed_data.test.ts
index 741690bc47f..97b5c89d78f 100644
--- a/packages/web3-eth/test/integration/web3_eth/sign_typed_data.test.ts
+++ b/packages/web3-eth/test/integration/web3_eth/sign_typed_data.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { getEncodedEip712Data } from 'web3-eth-abi';
-import { ecrecover, toUint8Array } from 'web3-eth-accounts';
-import { bytesToHex, hexToNumber, keccak256 } from 'web3-utils';
+import { getEncodedEip712Data } from '@etn-sc/web3-eth-abi';
+import { ecrecover, toUint8Array } from '@etn-sc/web3-eth-accounts';
+import { bytesToHex, hexToNumber, keccak256 } from '@etn-sc/web3-utils';
 
 import Web3Eth from '../../../src';
 import {
diff --git a/packages/web3-eth/test/unit/decoding.test.ts b/packages/web3-eth/test/unit/decoding.test.ts
index 94627d84575..008eeaae3a6 100644
--- a/packages/web3-eth/test/unit/decoding.test.ts
+++ b/packages/web3-eth/test/unit/decoding.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { AbiEventFragment, LogsInput } from 'web3-types';
+import { AbiEventFragment, LogsInput } from '@etn-sc/web3-types';
 import { decodeEventABI } from '../../src';
 import { decodeEventABIData } from '../fixtures/decoding';
 
diff --git a/packages/web3-eth/test/unit/default_transaction_builder.test.ts b/packages/web3-eth/test/unit/default_transaction_builder.test.ts
index 0e065806393..ece82793abd 100644
--- a/packages/web3-eth/test/unit/default_transaction_builder.test.ts
+++ b/packages/web3-eth/test/unit/default_transaction_builder.test.ts
@@ -21,22 +21,22 @@ import {
 	Transaction,
 	ValidChains,
 	Hardfork,
-} from 'web3-types';
-import { Web3Context } from 'web3-core';
-import HttpProvider from 'web3-providers-http';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 import {
 	Eip1559NotSupportedError,
 	TransactionDataAndInputError,
 	UnableToPopulateNonceError,
 	UnsupportedTransactionTypeError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import { defaultTransactionBuilder } from '../../src/utils/transaction_builder';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 const expectedNetworkId = '0x4';
-jest.mock('web3-net', () => ({
+jest.mock('@etn-sc/web3-net', () => ({
 	getId: jest.fn().mockImplementation(() => expectedNetworkId),
 }));
 
diff --git a/packages/web3-eth/test/unit/detect_transaction_type.test.ts b/packages/web3-eth/test/unit/detect_transaction_type.test.ts
index 4d583bbad17..46c446ad997 100644
--- a/packages/web3-eth/test/unit/detect_transaction_type.test.ts
+++ b/packages/web3-eth/test/unit/detect_transaction_type.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { InvalidPropertiesForTransactionTypeError } from 'web3-errors';
-import { Web3Context } from 'web3-core';
-import { EthExecutionAPI } from 'web3-types';
-import HttpProvider from 'web3-providers-http';
+import { InvalidPropertiesForTransactionTypeError } from '@etn-sc/web3-errors';
+import { Web3Context } from '@etn-sc/web3-core';
+import { EthExecutionAPI } from '@etn-sc/web3-types';
+import HttpProvider from '@etn-sc/web3-providers-http';
 
 import { detectTransactionType } from '../../src/utils/detect_transaction_type';
 import {
diff --git a/packages/web3-eth/test/unit/errors.test.ts b/packages/web3-eth/test/unit/errors.test.ts
index e51cb8764a8..65c015248a8 100644
--- a/packages/web3-eth/test/unit/errors.test.ts
+++ b/packages/web3-eth/test/unit/errors.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { InvalidTransactionCall, InvalidTransactionWithSender } from 'web3-errors';
+import { InvalidTransactionCall, InvalidTransactionWithSender } from '@etn-sc/web3-errors';
 import { InvalidTransactionWithSenderData, InvalidTransactionCallData } from '../fixtures/errors';
 
 describe('errors', () => {
diff --git a/packages/web3-eth/test/unit/format_rpc_methods.test.ts b/packages/web3-eth/test/unit/format_rpc_methods.test.ts
index 23156d96d28..04f0bf711e1 100644
--- a/packages/web3-eth/test/unit/format_rpc_methods.test.ts
+++ b/packages/web3-eth/test/unit/format_rpc_methods.test.ts
@@ -15,14 +15,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ethRpcMethods } from 'web3-rpc-methods';
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
-import { numberToHex, isNullish } from 'web3-utils';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
+import { numberToHex, isNullish } from '@etn-sc/web3-utils';
 import * as rpcMethodWrappers from '../../src/rpc_method_wrappers';
 import { getPastLogsValidFormatData } from '../fixtures/web3_eth_methods_with_parameters';
 import Web3Eth from '../../src/index';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 describe('web3_eth_methods formatting', () => {
 	let web3Eth: Web3Eth;
 
diff --git a/packages/web3-eth/test/unit/format_transaction.test.ts b/packages/web3-eth/test/unit/format_transaction.test.ts
index 028ac043b20..3caa9f4d3ee 100644
--- a/packages/web3-eth/test/unit/format_transaction.test.ts
+++ b/packages/web3-eth/test/unit/format_transaction.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Transaction } from 'web3-types';
-import { TransactionDataAndInputError } from 'web3-errors';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Transaction } from '@etn-sc/web3-types';
+import { TransactionDataAndInputError } from '@etn-sc/web3-errors';
 
 import { formatTransaction } from '../../src/utils/format_transaction';
 import {
diff --git a/packages/web3-eth/test/unit/prepare_transaction_for_signing.test.ts b/packages/web3-eth/test/unit/prepare_transaction_for_signing.test.ts
index cf301264407..d1ce66a3702 100644
--- a/packages/web3-eth/test/unit/prepare_transaction_for_signing.test.ts
+++ b/packages/web3-eth/test/unit/prepare_transaction_for_signing.test.ts
@@ -15,18 +15,18 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EthExecutionAPI } from 'web3-types';
-import { Web3Context } from 'web3-core';
-import HttpProvider from 'web3-providers-http';
-import { isNullish } from 'web3-validator';
+import { EthExecutionAPI } from '@etn-sc/web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import { isNullish } from '@etn-sc/web3-validator';
 import {
 	AccessListEIP2930Transaction,
 	FeeMarketEIP1559Transaction,
 	Transaction,
-} from 'web3-eth-accounts';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-eth-accounts';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
-import { bytesToHex, hexToBytes } from 'web3-utils';
+import { bytesToHex, hexToBytes } from '@etn-sc/web3-utils';
 import { prepareTransactionForSigning } from '../../src/utils/prepare_transaction_for_signing';
 import { validTransactions } from '../fixtures/prepare_transaction_for_signing';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/call.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/call.test.ts
index e981aef6a10..685a598c1ea 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/call.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/call.test.ts
@@ -14,23 +14,23 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 import {
 	Web3EthExecutionAPI,
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { format } from 'web3-utils';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { format } from '@etn-sc/web3-utils';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { call } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/call';
 import { formatTransaction } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('call', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/createAccessList.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/createAccessList.test.ts
index 0ffeb0dcad6..810cb1bb5fe 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/createAccessList.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/createAccessList.test.ts
@@ -14,17 +14,17 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { Web3EthExecutionAPI, ETH_DATA_FORMAT, FMT_BYTES, FMT_NUMBER } from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { format } from 'web3-utils';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Web3EthExecutionAPI, ETH_DATA_FORMAT, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { format } from '@etn-sc/web3-utils';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { createAccessList } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/createAccessList';
 import { formatTransaction } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('createAccessList', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/estimate_gas.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/estimate_gas.test.ts
index 6dc605b67e3..1347e403b28 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/estimate_gas.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/estimate_gas.test.ts
@@ -14,23 +14,23 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { isNullish } from 'web3-validator';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { isNullish } from '@etn-sc/web3-validator';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { estimateGas } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/estimate_gas';
 import { formatTransaction } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('call', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/call.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/call.ts
index e8949e97eab..1e269595984 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/call.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/call.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, TransactionCall } from 'web3-types';
+import { BlockNumberOrTag, BlockTags, TransactionCall } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x000000000000000000000000000000000000000000000000000000000000000a';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/createAccessList.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/createAccessList.ts
index 1984c34c50a..60721a36168 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/createAccessList.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/createAccessList.ts
@@ -20,7 +20,7 @@ import {
 	DataFormat,
 	DEFAULT_RETURN_FORMAT,
 	TransactionForAccessList,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 
 export const mockRpcResponse =
 	'{"accessList":[{"address":"0x15859bdf5aff2080a9968f6a410361e9598df62f","storageKeys":["0x0000000000000000000000000000000000000000000000000000000000000000"]}],"gasUsed":"0x7671"}';
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/estimate_gas.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/estimate_gas.ts
index 2dfc07e11fd..c3f207e8b97 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/estimate_gas.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/estimate_gas.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Transaction } from 'web3-types';
+import { BlockNumberOrTag, BlockTags, Transaction } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x5208';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_balance.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_balance.ts
index 6c933d470ea..7fb06e78ec5 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_balance.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_balance.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockNumberOrTag, BlockTags } from 'web3-types';
+import { Address, BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xe8d4a51000';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block.ts
index 4474bec4972..7c864bafd09 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Block, TransactionInfo, BlockNumberOrTag, BlockTags, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Block, TransactionInfo, BlockNumberOrTag, BlockTags, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse: Block = {
 	parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_transaction_count.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_transaction_count.ts
index db0f08c701b..a4fd63b0794 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_transaction_count.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_transaction_count.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { BlockNumberOrTag, BlockTags, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_uncle_count.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_uncle_count.ts
index db0f08c701b..a4fd63b0794 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_uncle_count.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_block_uncle_count.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { BlockNumberOrTag, BlockTags, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_code.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_code.ts
index d23918f3efa..187823f0d1f 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_code.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_code.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockNumberOrTag, BlockTags } from 'web3-types';
+import { Address, BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse =
 	'0x600160008035811a818181146012578301005b601b6001356025565b8060005260206000f25b600060078202905091905056';
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_fee_history.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_fee_history.ts
index 54ea874c610..e139f24369c 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_fee_history.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_fee_history.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { FeeHistoryResultAPI, BlockNumberOrTag, BlockTags, Numbers } from 'web3-types';
+import { FeeHistoryResultAPI, BlockNumberOrTag, BlockTags, Numbers } from '@etn-sc/web3-types';
 
 export const mockRpcResponse: FeeHistoryResultAPI = {
 	oldestBlock: '0xa30950',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_logs.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_logs.ts
index e38527f2b9a..582a9db4bc2 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_logs.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_logs.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { FilterResultsAPI, Filter } from 'web3-types';
+import { FilterResultsAPI, Filter } from '@etn-sc/web3-types';
 
 export const mockRpcResponse: FilterResultsAPI = [
 	{
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_pending_transactions.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_pending_transactions.ts
index 5ee9d3fd070..b2e528e7735 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_pending_transactions.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_pending_transactions.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Transaction } from 'web3-types';
+import { Transaction } from '@etn-sc/web3-types';
 
 const transaction: Transaction = {
 	from: '0xEB014f8c8B418Db6b45774c326A0E64C78914dC0',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_proof.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_proof.ts
index ce0f4c7df4a..3ba95d2b62a 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_proof.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_proof.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockNumberOrTag, BlockTags, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Address, BlockNumberOrTag, BlockTags, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse = {
 	accountProof: [
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_storage_at.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_storage_at.ts
index 9afd4c3934c..5419a992062 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_storage_at.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_storage_at.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockNumberOrTag, BlockTags, Numbers } from 'web3-types';
+import { Address, BlockNumberOrTag, BlockTags, Numbers } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x033456732123ffff2342342dd12342434324234234fd234fd23fd4f23d4234';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction.ts
index cfc2e81942a..87193beebe8 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, TransactionInfo } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Bytes, TransactionInfo } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse: TransactionInfo = {
 	accessList: [],
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_count.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_count.ts
index 6c933d470ea..7fb06e78ec5 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_count.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_count.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockNumberOrTag, BlockTags } from 'web3-types';
+import { Address, BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xe8d4a51000';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_from_block.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_from_block.ts
index b9d768e4664..778762c4d0c 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_from_block.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_from_block.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Bytes, Numbers, Transaction } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { BlockNumberOrTag, BlockTags, Bytes, Numbers, Transaction } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse: Transaction = {
 	from: '0xEB014f8c8B418Db6b45774c326A0E64C78914dC0',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_receipt.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_receipt.ts
index 2fbc413630a..9cd79b877f6 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_receipt.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_transaction_receipt.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionReceipt, Bytes } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { TransactionReceipt, Bytes } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse: TransactionReceipt = {
 	transactionHash: '0xe21194c9509beb01be7e90c2bcefff2804cd85836ae12134f22ad4acda0fc547',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_uncle.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_uncle.ts
index 95886e7940a..d3062146d10 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_uncle.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/get_uncle.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Bytes, Numbers, Block } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { BlockNumberOrTag, BlockTags, Bytes, Numbers, Block } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse: Block = {
 	parentHash: '0xe99e022112df268087ea7eafaf4790497fd21dbeeb6bd7a1721df161a6657a54',
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/return_formats.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/return_formats.ts
index 4796ab8736c..c6cecfc323a 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/return_formats.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/return_formats.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { DataFormat, FMT_BYTES, FMT_NUMBER } from 'web3-types';
+import { DataFormat, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
 
 export const returnFormats: DataFormat[] = [
 	{ number: FMT_NUMBER.NUMBER, bytes: FMT_BYTES.HEX },
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_signed_transaction.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_signed_transaction.ts
index f6e41600d12..72cc1374be6 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_signed_transaction.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_signed_transaction.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, TransactionReceipt } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Bytes, TransactionReceipt } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const expectedTransactionHash =
 	'0xe21194c9509beb01be7e90c2bcefff2804cd85836ae12134f22ad4acda0fc547';
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_transaction.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_transaction.ts
index 05bc02d2c31..53d4eb14973 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_transaction.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/send_transaction.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Transaction, TransactionReceipt } from 'web3-types';
+import { Transaction, TransactionReceipt } from '@etn-sc/web3-types';
 import { SendTransactionOptions } from '../../../../src/types';
 
 export const expectedTransactionHash =
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign.ts
index fa3f475d802..980680a1d3e 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, Bytes, FMT_BYTES, FMT_NUMBER } from 'web3-types';
-import { hexToBytes } from 'web3-utils';
+import { Address, Bytes, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 export const mockRpcResponse = '0x736f796c656e7420677265656e2069732070656f706c65';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_transaction.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_transaction.ts
index c95fd9b3275..c7534d395c7 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_transaction.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_transaction.ts
@@ -21,7 +21,7 @@ import {
 	TransactionSignedAPI,
 	FMT_BYTES,
 	FMT_NUMBER,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { decodeSignedTransaction } from '../../../../src/utils/decode_signed_transaction';
 
 const rawLegacyTransaction: Transaction = {
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_typed_data.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_typed_data.ts
index b01f33f698e..ce6dd1928c1 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_typed_data.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/fixtures/sign_typed_data.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, Eip712TypedData } from 'web3-types';
+import { Address, Eip712TypedData } from '@etn-sc/web3-types';
 
 const address = '0x407d73d8a49eeb85d32cf465507dd71d507100c1';
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_balance.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_balance.test.ts
index 5d9f8935f0b..2351ee4fbe7 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_balance.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_balance.test.ts
@@ -14,22 +14,22 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getBalance } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_balance';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getBalance', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block.test.ts
index 778c6d4d000..08d5b852d08 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
@@ -23,15 +23,15 @@ import {
 	FMT_BYTES,
 	Bytes,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isBytes, isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isBytes, isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getBlock } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, mockRpcResponseHydrated, testData } from './fixtures/get_block';
 import { blockSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getBlock', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_number.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_number.test.ts
index 71babcb4bf4..4c8e7ae45e2 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_number.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_number.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getBlockNumber } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getBlockNumber', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_transaction_count.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_transaction_count.test.ts
index 82392e47d9b..70e5e9cf153 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_transaction_count.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_transaction_count.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
@@ -23,14 +23,14 @@ import {
 	FMT_BYTES,
 	Bytes,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isBytes, isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isBytes, isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getBlockTransactionCount } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_block_transaction_count';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getBlockTransactionCount', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_uncle_count.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_uncle_count.test.ts
index 3556234315f..aea114ff6ed 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_uncle_count.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_block_uncle_count.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
@@ -23,14 +23,14 @@ import {
 	FMT_BYTES,
 	Bytes,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isBytes, isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isBytes, isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getBlockUncleCount } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_block_uncle_count';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getBlockUncleCount', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_chain_id.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_chain_id.test.ts
index e753bf13804..ac50645c1f0 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_chain_id.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_chain_id.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getChainId } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getChainId', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_code.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_code.test.ts
index 51f63db815f..08336475bcc 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_code.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_code.test.ts
@@ -14,22 +14,22 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getCode } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_code';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getCode', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_coinbase.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_coinbase.test.ts
index 6a896c33763..447fbe49bdb 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_coinbase.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_coinbase.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getCoinbase } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getCoinbase', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_fee_history.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_fee_history.test.ts
index 8a89aa75369..044222a1629 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_fee_history.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_fee_history.test.ts
@@ -14,24 +14,24 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getFeeHistory } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_fee_history';
 import { feeHistorySchema } from '../../../src/schemas';
 import { NUMBER_DATA_FORMAT } from '../../../src/constants';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getFeeHistory', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_gas_price.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_gas_price.test.ts
index 3053e2623ac..89c04f80cc6 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_gas_price.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_gas_price.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getGasPrice } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getGasPrice', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_hash_rate.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_hash_rate.test.ts
index 8d8c7a04702..8536b5a9f31 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_hash_rate.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_hash_rate.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getHashRate } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getHashRate', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_logs.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_logs.test.ts
index 903ddf61b10..775546fab0c 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_logs.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_logs.test.ts
@@ -14,16 +14,16 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getLogs } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_logs';
 import { logSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getLogs', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_pending_transactions.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_pending_transactions.test.ts
index 211295389c7..4f58cf6de44 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_pending_transactions.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_pending_transactions.test.ts
@@ -14,15 +14,15 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getPendingTransactions } from '../../../src/rpc_method_wrappers';
 import { formatTransaction } from '../../../src';
 import { mockRpcResponse } from './fixtures/get_pending_transactions';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getPendingTransactions', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_proof.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_proof.test.ts
index 65960a791e5..b172ad017f4 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_proof.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_proof.test.ts
@@ -14,23 +14,23 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getProof } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_proof';
 import { accountSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getProof', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_protocol_version.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_protocol_version.test.ts
index 5ebe9c200e9..f16d37cef7b 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_protocol_version.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_protocol_version.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getProtocolVersion } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getProtocolVersion', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_storage_at.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_storage_at.test.ts
index 6006cd8334c..89e7055d26c 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_storage_at.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_storage_at.test.ts
@@ -14,22 +14,22 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getStorageAt } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_storage_at';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getStorageAt', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction.test.ts
index 225a9e106ef..eb2937c8ab4 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction.test.ts
@@ -14,16 +14,16 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getTransaction } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_transaction';
 import { formatTransaction, transactionInfoSchema } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getTransaction', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_count.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_count.test.ts
index 2907477aef1..66264561b6d 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_count.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_count.test.ts
@@ -14,22 +14,22 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
 	FMT_NUMBER,
 	FMT_BYTES,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getTransactionCount } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_transaction_count';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getTransactionCount', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_from_block.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_from_block.test.ts
index 8f0a231da01..93496dfea22 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_from_block.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_from_block.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
@@ -23,15 +23,15 @@ import {
 	FMT_BYTES,
 	Bytes,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isBytes, isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isBytes, isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getTransactionFromBlock } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_transaction_from_block';
 import { formatTransaction, transactionInfoSchema } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getTransactionFromBlock', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_receipt.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_receipt.test.ts
index f9d5d2ef462..53b79606d5d 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_receipt.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_transaction_receipt.test.ts
@@ -14,16 +14,16 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getTransactionReceipt } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_transaction_receipt';
 import { transactionReceiptSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getTransactionReceipt', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/get_uncle.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/get_uncle.test.ts
index fbbfa1ca510..1aa95e4c040 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/get_uncle.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/get_uncle.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 import {
 	ETH_DATA_FORMAT,
 	DEFAULT_RETURN_FORMAT,
@@ -23,15 +23,15 @@ import {
 	FMT_BYTES,
 	Bytes,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isBytes, isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isBytes, isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { getUncle } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData } from './fixtures/get_uncle';
 import { blockSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('getUncle', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/is_mining.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/is_mining.test.ts
index e782aa321d4..9bcb961e400 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/is_mining.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/is_mining.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { isMining } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('isMining', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/is_syncing.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/is_syncing.test.ts
index 5920db0129b..b3afe766589 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/is_syncing.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/is_syncing.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { isSyncing } from '../../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('isSyncing', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/send_signed_transaction.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/send_signed_transaction.test.ts
index 4a741c46646..e560a863cc4 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/send_signed_transaction.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/send_signed_transaction.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { sendSignedTransaction } from '../../../src/rpc_method_wrappers';
 import * as WaitForTransactionReceipt from '../../../src/utils/wait_for_transaction_receipt';
@@ -30,7 +30,7 @@ import {
 import { transactionReceiptSchema } from '../../../src/schemas';
 import { SendTxHelper } from '../../../src/utils/send_tx_helper';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 jest.mock('../../../src/utils/wait_for_transaction_receipt');
 jest.mock('../../../src/utils/watch_transaction_for_confirmations');
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/send_transaction.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/send_transaction.test.ts
index 3be8182cd33..b39d65d5246 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/send_transaction.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/send_transaction.test.ts
@@ -14,11 +14,11 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, ETH_DATA_FORMAT, Web3EthExecutionAPI } from 'web3-types';
-import { isNullish } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, ETH_DATA_FORMAT, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { sendTransaction } from '../../../src/rpc_method_wrappers';
 import { formatTransaction } from '../../../src';
@@ -32,7 +32,7 @@ import {
 } from './fixtures/send_transaction';
 import { transactionReceiptSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 jest.mock('../../../src/utils/wait_for_transaction_receipt');
 jest.mock('../../../src/utils/watch_transaction_for_confirmations');
 
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/sign.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/sign.test.ts
index ebbbc16955c..221e56828c1 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/sign.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/sign.test.ts
@@ -14,17 +14,17 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
-import { Wallet } from 'web3-eth-accounts';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
+import { Wallet } from '@etn-sc/web3-eth-accounts';
 import { sign } from '../../../src/rpc_method_wrappers';
 import { mockRpcResponse, testData, walletTestData } from './fixtures/sign';
 import { createAccountProvider } from '../../fixtures/system_test_utils';
 import { SignatureObjectSchema } from '../../../src/schemas';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('sign', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/sign_transaction.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/sign_transaction.test.ts
index 68364142d32..601d07ff2a2 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/sign_transaction.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/sign_transaction.test.ts
@@ -14,21 +14,21 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 import {
 	DEFAULT_RETURN_FORMAT,
 	ETH_DATA_FORMAT,
 	SignedTransactionInfoAPI,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { isString } from 'web3-validator';
-import { ethRpcMethods } from 'web3-rpc-methods';
+} from '@etn-sc/web3-types';
+import { isString } from '@etn-sc/web3-validator';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { signTransaction } from '../../../src/rpc_method_wrappers';
 import { returnFormat, testData } from './fixtures/sign_transaction';
 import { formatTransaction } from '../../../src';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('signTransaction', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/rpc_method_wrappers/sign_typed_data.test.ts b/packages/web3-eth/test/unit/rpc_method_wrappers/sign_typed_data.test.ts
index 8256beb7f78..408f4f1b293 100644
--- a/packages/web3-eth/test/unit/rpc_method_wrappers/sign_typed_data.test.ts
+++ b/packages/web3-eth/test/unit/rpc_method_wrappers/sign_typed_data.test.ts
@@ -14,15 +14,15 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
-import { format } from 'web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DEFAULT_RETURN_FORMAT, FMT_BYTES, FMT_NUMBER, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
+import { format } from '@etn-sc/web3-utils';
 
 import { signTypedData } from '../../../src/rpc_method_wrappers';
 import { testData, mockRpcResponse } from './fixtures/sign_typed_data';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('signTypedData', () => {
 	let web3Context: Web3Context<Web3EthExecutionAPI>;
diff --git a/packages/web3-eth/test/unit/send_tx_helper.test.ts b/packages/web3-eth/test/unit/send_tx_helper.test.ts
index 55a482395b8..ca0819ad5b7 100644
--- a/packages/web3-eth/test/unit/send_tx_helper.test.ts
+++ b/packages/web3-eth/test/unit/send_tx_helper.test.ts
@@ -21,13 +21,13 @@ import {
 	JsonRpcResponse,
 	TransactionReceipt,
 	Web3BaseWalletAccount,
-} from 'web3-types';
-import { Web3Context, Web3EventMap, Web3PromiEvent } from 'web3-core';
+} from '@etn-sc/web3-types';
+import { Web3Context, Web3EventMap, Web3PromiEvent } from '@etn-sc/web3-core';
 import {
 	ContractExecutionError,
 	InvalidResponseError,
 	TransactionRevertInstructionError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import { SendTxHelper } from '../../src/utils/send_tx_helper';
 import { getTransactionError } from '../../src/utils/get_transaction_error';
 import { getTransactionGasPricing } from '../../src/utils/get_transaction_gas_pricing';
diff --git a/packages/web3-eth/test/unit/utils/getTransactionFromOrToAttr.test.ts b/packages/web3-eth/test/unit/utils/getTransactionFromOrToAttr.test.ts
index 879ff57f11f..f70cade3c2d 100644
--- a/packages/web3-eth/test/unit/utils/getTransactionFromOrToAttr.test.ts
+++ b/packages/web3-eth/test/unit/utils/getTransactionFromOrToAttr.test.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 
-import { Wallet } from 'web3-eth-accounts';
+import { Wallet } from '@etn-sc/web3-eth-accounts';
 import { getTransactionFromOrToAttr } from '../../../src/utils/transaction_builder';
 import {
 	validGetTransactionFromOrToAttrData,
diff --git a/packages/web3-eth/test/unit/utils/get_revert_reason.test.ts b/packages/web3-eth/test/unit/utils/get_revert_reason.test.ts
index 061837f4c54..f5ff415df6a 100644
--- a/packages/web3-eth/test/unit/utils/get_revert_reason.test.ts
+++ b/packages/web3-eth/test/unit/utils/get_revert_reason.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
 
 import * as RpcMethodWrappers from '../../../src/rpc_method_wrappers';
 import * as GetRevertReason from '../../../src/utils/get_revert_reason';
diff --git a/packages/web3-eth/test/unit/utils/get_transaction_error.test.ts b/packages/web3-eth/test/unit/utils/get_transaction_error.test.ts
index 898947f4889..0b2c5ef0dfc 100644
--- a/packages/web3-eth/test/unit/utils/get_transaction_error.test.ts
+++ b/packages/web3-eth/test/unit/utils/get_transaction_error.test.ts
@@ -15,13 +15,13 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 import {
 	InvalidResponseError,
 	TransactionRevertedWithoutReasonError,
 	TransactionRevertInstructionError,
 	TransactionRevertWithCustomError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 
 import * as GetRevertReasonUtils from '../../../src/utils/get_revert_reason';
 import { getTransactionError } from '../../../src/utils/get_transaction_error';
diff --git a/packages/web3-eth/test/unit/utils/get_transaction_type.test.ts b/packages/web3-eth/test/unit/utils/get_transaction_type.test.ts
index 73111b42067..044b73ef948 100644
--- a/packages/web3-eth/test/unit/utils/get_transaction_type.test.ts
+++ b/packages/web3-eth/test/unit/utils/get_transaction_type.test.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EthExecutionAPI, Transaction, ETH_DATA_FORMAT } from 'web3-types';
-import HttpProvider from 'web3-providers-http';
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
+import { EthExecutionAPI, Transaction, ETH_DATA_FORMAT } from '@etn-sc/web3-types';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
 
 import { transactionSchema } from '../../../src/schemas';
 import { getTransactionType } from '../../../src/utils/transaction_builder';
diff --git a/packages/web3-eth/test/unit/utils/parse_transaction_error.test.ts b/packages/web3-eth/test/unit/utils/parse_transaction_error.test.ts
index 0aa638597fe..fa08f32f276 100644
--- a/packages/web3-eth/test/unit/utils/parse_transaction_error.test.ts
+++ b/packages/web3-eth/test/unit/utils/parse_transaction_error.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { ContractExecutionError, InvalidResponseError } from 'web3-errors';
+import { ContractExecutionError, InvalidResponseError } from '@etn-sc/web3-errors';
 
 import { parseTransactionError } from '../../../src/utils/get_revert_reason';
 import { SimpleRevertAbi } from '../../fixtures/simple_revert';
diff --git a/packages/web3-eth/test/unit/utils/wait_for_transaction_receipt.test.ts b/packages/web3-eth/test/unit/utils/wait_for_transaction_receipt.test.ts
index 8b70dcdd3b2..1ed12f61e44 100644
--- a/packages/web3-eth/test/unit/utils/wait_for_transaction_receipt.test.ts
+++ b/packages/web3-eth/test/unit/utils/wait_for_transaction_receipt.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from 'web3-types';
-import { TransactionBlockTimeoutError } from 'web3-errors';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { TransactionBlockTimeoutError } from '@etn-sc/web3-errors';
 import { waitForTransactionReceipt } from '../../../src/utils/wait_for_transaction_receipt';
 
 describe('waitForTransactionReceipt unit test', () => {
diff --git a/packages/web3-eth/test/unit/utils/watch_transaction_by_polling.test.ts b/packages/web3-eth/test/unit/utils/watch_transaction_by_polling.test.ts
index 5a44db457e8..4ea00193930 100644
--- a/packages/web3-eth/test/unit/utils/watch_transaction_by_polling.test.ts
+++ b/packages/web3-eth/test/unit/utils/watch_transaction_by_polling.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 import * as rpcMethodWrappers from '../../../src/rpc_method_wrappers';
 import * as WaitForTransactionReceipt from '../../../src/utils/wait_for_transaction_receipt';
 
@@ -30,7 +30,7 @@ import {
 import { transactionReceiptSchema } from '../../../src/schemas';
 import { sleep } from '../../shared_fixtures/utils';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 jest.mock('../../../src/utils/wait_for_transaction_receipt');
 
 const mockBlockData = {
diff --git a/packages/web3-eth/test/unit/utils/watch_transaction_for_confirmations.test.ts b/packages/web3-eth/test/unit/utils/watch_transaction_for_confirmations.test.ts
index 21f630c8bd1..521baa8d97e 100644
--- a/packages/web3-eth/test/unit/utils/watch_transaction_for_confirmations.test.ts
+++ b/packages/web3-eth/test/unit/utils/watch_transaction_for_confirmations.test.ts
@@ -14,14 +14,14 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context, Web3PromiEvent } from 'web3-core';
-import { format } from 'web3-utils';
-import { DEFAULT_RETURN_FORMAT, TransactionReceipt, Web3EthExecutionAPI } from 'web3-types';
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { Web3Context, Web3PromiEvent } from '@etn-sc/web3-core';
+import { format } from '@etn-sc/web3-utils';
+import { DEFAULT_RETURN_FORMAT, TransactionReceipt, Web3EthExecutionAPI } from '@etn-sc/web3-types';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 import {
 	TransactionMissingReceiptOrBlockHashError,
 	TransactionReceiptMissingBlockNumberError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import * as rpcMethodWrappers from '../../../src/rpc_method_wrappers';
 import * as WaitForTransactionReceipt from '../../../src/utils/wait_for_transaction_receipt';
 
@@ -36,7 +36,7 @@ import {
 import { transactionReceiptSchema } from '../../../src/schemas';
 import { SendSignedTransactionEvents } from '../../../src/types';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 jest.mock('../../../src/utils/wait_for_transaction_receipt');
 jest.mock('../../../src/utils/watch_transaction_by_pooling');
 jest.mock('../../../src/utils/watch_transaction_by_subscription');
diff --git a/packages/web3-eth/test/unit/validate_transaction_for_signing.test.ts b/packages/web3-eth/test/unit/validate_transaction_for_signing.test.ts
index b2546dd5f3f..ae3db403653 100644
--- a/packages/web3-eth/test/unit/validate_transaction_for_signing.test.ts
+++ b/packages/web3-eth/test/unit/validate_transaction_for_signing.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable jest/no-conditional-expect */
 
-import { InvalidTransactionObjectError } from 'web3-errors';
+import { InvalidTransactionObjectError } from '@etn-sc/web3-errors';
 import { validateTransactionForSigning } from '../../src/validation';
 import {
 	invalidNonceOrChainIdData,
diff --git a/packages/web3-eth/test/unit/validation.test.ts b/packages/web3-eth/test/unit/validation.test.ts
index c805cdd75d7..8fbdbb5bd5e 100644
--- a/packages/web3-eth/test/unit/validation.test.ts
+++ b/packages/web3-eth/test/unit/validation.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable jest/no-conditional-expect */
 
-import { InvalidTransactionCall, InvalidTransactionWithSender } from 'web3-errors';
+import { InvalidTransactionCall, InvalidTransactionWithSender } from '@etn-sc/web3-errors';
 import {
 	isAccessList,
 	isAccessListEntry,
diff --git a/packages/web3-eth/test/unit/web3_eth_methods_no_parameters.test.ts b/packages/web3-eth/test/unit/web3_eth_methods_no_parameters.test.ts
index 6865188b456..154d643bd5e 100644
--- a/packages/web3-eth/test/unit/web3_eth_methods_no_parameters.test.ts
+++ b/packages/web3-eth/test/unit/web3_eth_methods_no_parameters.test.ts
@@ -14,11 +14,11 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import Web3Eth from '../../src/index';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('web3_eth_methods_no_parameters', () => {
 	let web3Eth: Web3Eth;
diff --git a/packages/web3-eth/test/unit/web3_eth_methods_with_parameters.test.ts b/packages/web3-eth/test/unit/web3_eth_methods_with_parameters.test.ts
index c2f017b24cf..8676a2acb24 100644
--- a/packages/web3-eth/test/unit/web3_eth_methods_with_parameters.test.ts
+++ b/packages/web3-eth/test/unit/web3_eth_methods_with_parameters.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { ethRpcMethods } from 'web3-rpc-methods';
+import { ethRpcMethods } from '@etn-sc/web3-rpc-methods';
 
-import { TransactionInfoAPI } from 'web3-types';
+import { TransactionInfoAPI } from '@etn-sc/web3-types';
 import Web3Eth from '../../src/index';
 import * as rpcMethodWrappers from '../../src/rpc_method_wrappers';
 import {
@@ -50,7 +50,7 @@ import {
 
 import { testData as createAccessListTestData } from './rpc_method_wrappers/fixtures/createAccessList';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 jest.mock('../../src/rpc_method_wrappers');
 // eslint-disable-next-line @typescript-eslint/no-unsafe-call
 jest.spyOn(rpcMethodWrappers, 'getTransaction').mockResolvedValue(tx as TransactionInfoAPI);
diff --git a/packages/web3-eth/test/unit/web3_eth_subscription.test.ts b/packages/web3-eth/test/unit/web3_eth_subscription.test.ts
index edbf28d215f..7245f6cbde1 100644
--- a/packages/web3-eth/test/unit/web3_eth_subscription.test.ts
+++ b/packages/web3-eth/test/unit/web3_eth_subscription.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3SubscriptionManager } from 'web3-core';
-import { Web3BaseProvider } from 'web3-types';
+import { Web3SubscriptionManager } from '@etn-sc/web3-core';
+import { Web3BaseProvider } from '@etn-sc/web3-types';
 import * as rpcMethodWrappers from '../../src/rpc_method_wrappers';
 import { LogsSubscription } from '../../src';
 import { Web3Eth } from '../../src/web3_eth';
diff --git a/packages/web3-net/README.md b/packages/web3-net/README.md
index 6e19cf6a079..5c2a58d56a8 100644
--- a/packages/web3-net/README.md
+++ b/packages/web3-net/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-net` package allows to interact with an Ethereum node’s network properties.
+`@etn-sc/web3-net` package allows to interact with an Electroneum node’s network properties.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-net) or using [Yarn](https://yarnpkg.com/package/web3-net)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-net)
 
 ### Using NPM
 
 ```bash
-npm install web3-net
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-net
+npm install @etn-sc/web3-net
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-net
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-net
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-net
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-net%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-net
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-net
 [downloads-image]: https://img.shields.io/npm/dm/web3-net?label=npm%20downloads
diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json
index f6ddefca6ee..a4f9428e6d2 100644
--- a/packages/web3-net/package.json
+++ b/packages/web3-net/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-net",
+	"name": "@etn-sc/web3-net",
 	"version": "4.0.7",
-	"description": "Web3 module to interact with the Ethereum nodes networking properties.",
+	"description": "Web3 module to interact with the Electroneum nodes networking properties.",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -56,9 +56,9 @@
 		"typescript": "^4.7.4"
 	},
 	"dependencies": {
-		"web3-core": "^4.3.0",
-		"web3-rpc-methods": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7"
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-rpc-methods": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7"
 	}
 }
diff --git a/packages/web3-net/src/index.ts b/packages/web3-net/src/index.ts
index d2ba11d7682..19fa33f9ace 100644
--- a/packages/web3-net/src/index.ts
+++ b/packages/web3-net/src/index.ts
@@ -19,11 +19,11 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  * The web3-net package allows you to interact with an Ethereum node’s network properties.
  *
  * ```ts
- * import Net from 'web3-net';
+ * import Net from '@etn-sc/web3-net';
  *
  * const net = new Net(Net.givenProvider || 'ws://some.local-or-remote.node:8546');
  * // or using the web3 umbrella package
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  * const web3 = new Web3(Web3.givenProvider || 'ws://some.local-or-remote.node:8546');
  *
  * // -> web3.eth.net
diff --git a/packages/web3-net/src/net.ts b/packages/web3-net/src/net.ts
index b03dcb23b04..8f603bd0db9 100644
--- a/packages/web3-net/src/net.ts
+++ b/packages/web3-net/src/net.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
-import { DataFormat, DEFAULT_RETURN_FORMAT, Web3NetAPI } from 'web3-types';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DataFormat, DEFAULT_RETURN_FORMAT, Web3NetAPI } from '@etn-sc/web3-types';
 
 import * as rpcMethodsWrappers from './rpc_method_wrappers.js';
 
diff --git a/packages/web3-net/src/rpc_method_wrappers.ts b/packages/web3-net/src/rpc_method_wrappers.ts
index f923615998e..e91e6cb19a7 100644
--- a/packages/web3-net/src/rpc_method_wrappers.ts
+++ b/packages/web3-net/src/rpc_method_wrappers.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { format } from 'web3-utils';
-import { Web3Context } from 'web3-core';
-import { DataFormat, Web3NetAPI } from 'web3-types';
-import { netRpcMethods } from 'web3-rpc-methods';
+import { format } from '@etn-sc/web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { DataFormat, Web3NetAPI } from '@etn-sc/web3-types';
+import { netRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 export async function getId<ReturnFormat extends DataFormat>(
 	web3Context: Web3Context<Web3NetAPI>,
diff --git a/packages/web3-net/test/fixtures/rpc_method_wrappers.ts b/packages/web3-net/test/fixtures/rpc_method_wrappers.ts
index 0e76bcdd39b..e4dd98fee59 100644
--- a/packages/web3-net/test/fixtures/rpc_method_wrappers.ts
+++ b/packages/web3-net/test/fixtures/rpc_method_wrappers.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { DataFormat, FMT_BYTES, FMT_NUMBER } from 'web3-types';
+import { DataFormat, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
 
 export const getIdValidData: [DataFormat, any, any][] = [
 	[{ number: FMT_NUMBER.HEX, bytes: FMT_BYTES.HEX }, '3', '0x3'],
diff --git a/packages/web3-net/test/fixtures/web3_net_methods.ts b/packages/web3-net/test/fixtures/web3_net_methods.ts
index 85f2c4110b4..a7209ae1f73 100644
--- a/packages/web3-net/test/fixtures/web3_net_methods.ts
+++ b/packages/web3-net/test/fixtures/web3_net_methods.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { DataFormat, FMT_BYTES, FMT_NUMBER } from 'web3-types';
+import { DataFormat, FMT_BYTES, FMT_NUMBER } from '@etn-sc/web3-types';
 
 export const getDataFormat: DataFormat[] = [
 	{ number: FMT_NUMBER.HEX, bytes: FMT_BYTES.HEX },
diff --git a/packages/web3-net/test/integration/web3_net.test.ts b/packages/web3-net/test/integration/web3_net.test.ts
index f0786d45f60..7d1336ab813 100644
--- a/packages/web3-net/test/integration/web3_net.test.ts
+++ b/packages/web3-net/test/integration/web3_net.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { SupportedProviders, Web3NetAPI } from 'web3-types';
+import { SupportedProviders, Web3NetAPI } from '@etn-sc/web3-types';
 import Net from '../../src';
 
 import { closeOpenConnection, getSystemTestProvider } from '../fixtures/system_tests_utils';
diff --git a/packages/web3-net/test/unit/rpc_method_wrappers.test.ts b/packages/web3-net/test/unit/rpc_method_wrappers.test.ts
index 47d014e2b3e..f705baa950b 100644
--- a/packages/web3-net/test/unit/rpc_method_wrappers.test.ts
+++ b/packages/web3-net/test/unit/rpc_method_wrappers.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { netRpcMethods } from 'web3-rpc-methods';
+import { netRpcMethods } from '@etn-sc/web3-rpc-methods';
 
 import { Net } from '../../src';
 import { getIdValidData, getPeerCountValidData } from '../fixtures/rpc_method_wrappers';
 import { getId, getPeerCount, isListening } from '../../src/rpc_method_wrappers';
 
-jest.mock('web3-rpc-methods');
+jest.mock('@etn-sc/web3-rpc-methods');
 
 describe('rpc_method_wrappers', () => {
 	let web3Net: Net;
diff --git a/packages/web3-providers-http/README.md b/packages/web3-providers-http/README.md
index 12c52dd4c1e..2493265e16e 100644
--- a/packages/web3-providers-http/README.md
+++ b/packages/web3-providers-http/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-providers-http` contains the Web3.js provider for the HTTP protocol.
+`@etn-sc/web3-providers-http` contains the Web3.js provider for the HTTP protocol.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-providers-http) or using [Yarn](https://yarnpkg.com/package/web3-providers-http)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-providers-http)
 
 ### Using NPM
 
 ```bash
-npm install web3-providers-http
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-providers-http
+npm install @etn-sc/web3-providers-http
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new/choose) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new/choose)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-providers-http
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-providers-http
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-providers-http
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-http%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-providers-http
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-providers-http
 [downloads-image]: https://img.shields.io/npm/dm/web3-providers-http?label=npm%20downloads
diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json
index 6a01d2e835d..96a4e27000c 100644
--- a/packages/web3-providers-http/package.json
+++ b/packages/web3-providers-http/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-providers-http",
+	"name": "@etn-sc/web3-providers-http",
 	"version": "4.1.0",
 	"description": "HTTP provider for Web3 4.x.x",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -61,8 +61,8 @@
 	},
 	"dependencies": {
 		"cross-fetch": "^4.0.0",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7"
 	}
 }
diff --git a/packages/web3-providers-http/src/index.ts b/packages/web3-providers-http/src/index.ts
index 64dadd9895d..30b7d2a563a 100644
--- a/packages/web3-providers-http/src/index.ts
+++ b/packages/web3-providers-http/src/index.ts
@@ -25,8 +25,8 @@ import {
 	Web3APISpec,
 	Web3BaseProvider,
 	Web3ProviderStatus,
-} from 'web3-types';
-import { InvalidClientError, MethodNotImplementedError, ResponseError } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { InvalidClientError, MethodNotImplementedError, ResponseError } from '@etn-sc/web3-errors';
 import { HttpProviderOptions } from './types.js';
 
 export { HttpProviderOptions } from './types.js';
diff --git a/packages/web3-providers-http/test/integration/request.test.ts b/packages/web3-providers-http/test/integration/request.test.ts
index 9865b768f85..ee04400c349 100644
--- a/packages/web3-providers-http/test/integration/request.test.ts
+++ b/packages/web3-providers-http/test/integration/request.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EthExecutionAPI, Web3APIPayload, JsonRpcResponseWithResult } from 'web3-types';
+import { EthExecutionAPI, Web3APIPayload, JsonRpcResponseWithResult } from '@etn-sc/web3-types';
 import HttpProvider from '../../src/index';
 import {
 	getSystemTestProviderUrl,
diff --git a/packages/web3-providers-http/test/unit/implemented_methods.test.ts b/packages/web3-providers-http/test/unit/implemented_methods.test.ts
index 892af84607b..e9cdaea3355 100644
--- a/packages/web3-providers-http/test/unit/implemented_methods.test.ts
+++ b/packages/web3-providers-http/test/unit/implemented_methods.test.ts
@@ -21,9 +21,9 @@ import fetchMock from 'jest-fetch-mock';
 jest.setMock('cross-fetch', fetchMock);
 
 /* eslint-disable-next-line import/first */
-import { Web3APIPayload, EthExecutionAPI } from 'web3-types';
+import { Web3APIPayload, EthExecutionAPI } from '@etn-sc/web3-types';
 /* eslint-disable-next-line import/first */
-import { ResponseError } from 'web3-errors';
+import { ResponseError } from '@etn-sc/web3-errors';
 /* eslint-disable-next-line import/first */
 import HttpProvider from '../../src/index';
 /* eslint-disable-next-line import/first */
diff --git a/packages/web3-providers-http/test/unit/not_implemented_methods.test.ts b/packages/web3-providers-http/test/unit/not_implemented_methods.test.ts
index 683e60f6c91..5658ac1ca4f 100644
--- a/packages/web3-providers-http/test/unit/not_implemented_methods.test.ts
+++ b/packages/web3-providers-http/test/unit/not_implemented_methods.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { MethodNotImplementedError } from 'web3-errors';
+import { MethodNotImplementedError } from '@etn-sc/web3-errors';
 
 import HttpProvider from '../../src/index';
 
diff --git a/packages/web3-providers-ipc/README.md b/packages/web3-providers-ipc/README.md
index 39913cd9584..8176f08d3d1 100644
--- a/packages/web3-providers-ipc/README.md
+++ b/packages/web3-providers-ipc/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-providers-ipc` contains the Web3.js provider for Inter Process Communication (IPC).
+`@etn-sc/web3-providers-ipc` contains the Web3.js provider for Inter Process Communication (IPC).
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-providers-ipc) or using [Yarn](https://yarnpkg.com/package/web3-providers-ipc)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-providers-ipc)
 
 ### Using NPM
 
 ```bash
-npm install web3-providers-ipc
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-providers-ipc
+npm install @etn-sc/web3-providers-ipc
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-providers-ipc
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-probiders-ipc
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-probiders-ipc
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ipc%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-providers-ipc
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-providers-ipc
 [downloads-image]: https://img.shields.io/npm/dm/web3-providers-ipc?label=npm%20downloads
diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json
index e0052448ae3..2daf65c04aa 100644
--- a/packages/web3-providers-ipc/package.json
+++ b/packages/web3-providers-ipc/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-providers-ipc",
+	"name": "@etn-sc/web3-providers-ipc",
 	"version": "4.0.7",
 	"description": "IPC provider for Web3 4.x.x",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -56,8 +56,8 @@
 		"typescript": "^4.7.4"
 	},
 	"dependencies": {
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7"
 	}
 }
diff --git a/packages/web3-providers-ipc/src/index.ts b/packages/web3-providers-ipc/src/index.ts
index 641d36ea083..09b5b918c86 100644
--- a/packages/web3-providers-ipc/src/index.ts
+++ b/packages/web3-providers-ipc/src/index.ts
@@ -16,15 +16,15 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { Socket, SocketConstructorOpts } from 'net';
-import { ConnectionNotOpenError, InvalidClientError } from 'web3-errors';
-import { ReconnectOptions, SocketProvider, toUtf8 } from 'web3-utils';
+import { ConnectionNotOpenError, InvalidClientError } from '@etn-sc/web3-errors';
+import { ReconnectOptions, SocketProvider, toUtf8 } from '@etn-sc/web3-utils';
 import {
 	EthExecutionAPI,
 	Web3APIMethod,
 	Web3APIPayload,
 	Web3APISpec,
 	Web3ProviderStatus,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { existsSync } from 'fs';
 
 /**
diff --git a/packages/web3-providers-ipc/test/integration/eip1193.test.ts b/packages/web3-providers-ipc/test/integration/eip1193.test.ts
index 74ab2b32aa8..c2d9e7f8421 100644
--- a/packages/web3-providers-ipc/test/integration/eip1193.test.ts
+++ b/packages/web3-providers-ipc/test/integration/eip1193.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { hexToNumber } from 'web3-utils';
-import { HexString, ProviderRpcError, ProviderConnectInfo } from 'web3-types';
+import { hexToNumber } from '@etn-sc/web3-utils';
+import { HexString, ProviderRpcError, ProviderConnectInfo } from '@etn-sc/web3-types';
 import { IpcProvider } from '../../src/index';
 
 import {
diff --git a/packages/web3-providers-ipc/test/unit/ipc_provider.test.ts b/packages/web3-providers-ipc/test/unit/ipc_provider.test.ts
index b607e8b92a0..30cee850b61 100644
--- a/packages/web3-providers-ipc/test/unit/ipc_provider.test.ts
+++ b/packages/web3-providers-ipc/test/unit/ipc_provider.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 import { Socket } from 'net';
 import * as fs from 'fs';
-import { ConnectionError, InvalidClientError } from 'web3-errors';
+import { ConnectionError, InvalidClientError } from '@etn-sc/web3-errors';
 import { IpcProvider } from '../../src/index';
 
 jest.mock('net');
diff --git a/packages/web3-providers-ws/README.md b/packages/web3-providers-ws/README.md
index 942839b6b23..ec969070557 100644
--- a/packages/web3-providers-ws/README.md
+++ b/packages/web3-providers-ws/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-providers-ws` contains the Web3.js provider for the Websocket protocol.
+`@etn-sc/web3-providers-ws` contains the Web3.js provider for the Websocket protocol.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-providers-ws) or using [Yarn](https://yarnpkg.com/package/web3-providers-ws)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-providers-ws)
 
 ### Using NPM
 
 ```bash
-npm install web3-providers-ws
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-providers-ws
+npm install @etn-sc/web3-providers-ws
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-providers-ws
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-providers-ws
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-providers-ws
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ws%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-providers-ws
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-providers-ws
 [downloads-image]: https://img.shields.io/npm/dm/web3-providers-ws?label=npm%20downloads
diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json
index 6aa3bde1ee1..abfa2ba3385 100644
--- a/packages/web3-providers-ws/package.json
+++ b/packages/web3-providers-ws/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-providers-ws",
+	"name": "@etn-sc/web3-providers-ws",
 	"version": "4.0.7",
 	"description": "Websocket provider for Web3 4.x.x",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -63,9 +63,9 @@
 	"dependencies": {
 		"@types/ws": "8.5.3",
 		"isomorphic-ws": "^5.0.0",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7",
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7",
 		"ws": "^8.8.1"
 	}
 }
diff --git a/packages/web3-providers-ws/src/index.ts b/packages/web3-providers-ws/src/index.ts
index 4591e2b0a26..587a6881792 100644
--- a/packages/web3-providers-ws/src/index.ts
+++ b/packages/web3-providers-ws/src/index.ts
@@ -23,9 +23,9 @@ import {
 	Web3APIPayload,
 	Web3APISpec,
 	Web3ProviderStatus,
-} from 'web3-types';
-import { isNullish, ReconnectOptions, SocketProvider } from 'web3-utils';
-import { ConnectionNotOpenError } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { isNullish, ReconnectOptions, SocketProvider } from '@etn-sc/web3-utils';
+import { ConnectionNotOpenError } from '@etn-sc/web3-errors';
 
 export { ClientRequestArgs } from 'http';
 
diff --git a/packages/web3-providers-ws/test/integration/eip1193.test.ts b/packages/web3-providers-ws/test/integration/eip1193.test.ts
index 04c36e3888a..cf81aea1aad 100644
--- a/packages/web3-providers-ws/test/integration/eip1193.test.ts
+++ b/packages/web3-providers-ws/test/integration/eip1193.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { hexToNumber } from 'web3-utils';
-import { HexString, ProviderConnectInfo, ProviderRpcError } from 'web3-types';
+import { hexToNumber } from '@etn-sc/web3-utils';
+import { HexString, ProviderConnectInfo, ProviderRpcError } from '@etn-sc/web3-types';
 import WebSocketProvider from '../../src/index';
 
 import {
diff --git a/packages/web3-providers-ws/test/integration/ganache_fault_tolerance.test.ts b/packages/web3-providers-ws/test/integration/ganache_fault_tolerance.test.ts
index 4a0ba982996..96a9fb72434 100644
--- a/packages/web3-providers-ws/test/integration/ganache_fault_tolerance.test.ts
+++ b/packages/web3-providers-ws/test/integration/ganache_fault_tolerance.test.ts
@@ -15,11 +15,11 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { ProviderRpcError } from 'web3-types/src/web3_api_types';
+import { ProviderRpcError } from '@etn-sc/web3-types/src/web3_api_types';
 import ganache from 'ganache';
-import { EthExecutionAPI, Web3APIPayload, SocketRequestItem, JsonRpcResponse } from 'web3-types';
-import { InvalidResponseError, ConnectionNotOpenError } from 'web3-errors';
-import { Web3DeferredPromise } from 'web3-utils';
+import { EthExecutionAPI, Web3APIPayload, SocketRequestItem, JsonRpcResponse } from '@etn-sc/web3-types';
+import { InvalidResponseError, ConnectionNotOpenError } from '@etn-sc/web3-errors';
+import { Web3DeferredPromise } from '@etn-sc/web3-utils';
 import {
 	waitForSocketConnect,
 	waitForEvent,
diff --git a/packages/web3-providers-ws/test/integration/reconnection.test.ts b/packages/web3-providers-ws/test/integration/reconnection.test.ts
index aeb72838252..559d066447d 100644
--- a/packages/web3-providers-ws/test/integration/reconnection.test.ts
+++ b/packages/web3-providers-ws/test/integration/reconnection.test.ts
@@ -16,7 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import { CloseEvent } from 'ws';
-import { ProviderRpcError } from 'web3-types/src/web3_api_types';
+import { ProviderRpcError } from '@etn-sc/web3-types/src/web3_api_types';
 import WebSocketProvider from '../../src';
 
 import { createProxy } from '../fixtures/proxy';
diff --git a/packages/web3-providers-ws/test/integration/web_socket_provider_integration.test.ts b/packages/web3-providers-ws/test/integration/web_socket_provider_integration.test.ts
index d93521be0c2..df683891fc8 100644
--- a/packages/web3-providers-ws/test/integration/web_socket_provider_integration.test.ts
+++ b/packages/web3-providers-ws/test/integration/web_socket_provider_integration.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3WSProviderError } from 'web3-errors';
+import { Web3WSProviderError } from '@etn-sc/web3-errors';
 import {
 	EthExecutionAPI,
 	JsonRpcId,
@@ -25,8 +25,8 @@ import {
 	ProviderRpcError,
 	SocketRequestItem,
 	Web3APIPayload,
-} from 'web3-types';
-import { Web3DeferredPromise } from 'web3-utils';
+} from '@etn-sc/web3-types';
+import { Web3DeferredPromise } from '@etn-sc/web3-utils';
 import WebSocketProvider from '../../src/index';
 import {
 	createTempAccount,
diff --git a/packages/web3-providers-ws/test/unit/__mocks__/isomorphic-ws.ts b/packages/web3-providers-ws/test/unit/__mocks__/isomorphic-ws.ts
index 42a0cdf4871..68798ecf03c 100644
--- a/packages/web3-providers-ws/test/unit/__mocks__/isomorphic-ws.ts
+++ b/packages/web3-providers-ws/test/unit/__mocks__/isomorphic-ws.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EventEmitter } from 'web3-utils';
+import { EventEmitter } from '@etn-sc/web3-utils';
 
 export default class WebSocket extends EventEmitter {
 	public readyState: number;
diff --git a/packages/web3-providers-ws/test/unit/web_socket_provider.test.ts b/packages/web3-providers-ws/test/unit/web_socket_provider.test.ts
index cfa68881f45..930648ec0b9 100644
--- a/packages/web3-providers-ws/test/unit/web_socket_provider.test.ts
+++ b/packages/web3-providers-ws/test/unit/web_socket_provider.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import WebSocket from 'isomorphic-ws';
-import { EthExecutionAPI, Web3APIPayload } from 'web3-types';
+import { EthExecutionAPI, Web3APIPayload } from '@etn-sc/web3-types';
 import WebSocketProvider from '../../src/index';
 import {
 	invalidConnectionStrings,
diff --git a/packages/web3-rpc-methods/README.md b/packages/web3-rpc-methods/README.md
index 2b46d105286..1514e973e64 100644
--- a/packages/web3-rpc-methods/README.md
+++ b/packages/web3-rpc-methods/README.md
@@ -9,31 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-rpc-methods` contains RPC methods for various ETH related protocols.
+`@etn-sc/web3-rpc-methods` contains RPC methods for various ETN related protocols.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-rpc-methods) or using [Yarn](https://yarnpkg.com/package/web3-rpc-methods)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-rpc-methods)
 
 ### Using NPM
 
 ```bash
-npm install web3-rpc-methods
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-rpc-methods
+npm install @etn-sc/web3-rpc-methods
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
-
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 ## Prerequisites
 
 -   :gear: [NodeJS](https://nodejs.org/) (LTS/Fermium)
@@ -53,7 +45,7 @@ yarn add web3-rpc-methods
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-rpc-methods
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-rpc-methods
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-rpc-methods%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-rpc-methods
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-rpc-methods
 [downloads-image]: https://img.shields.io/npm/dm/web3-rpc-methods?label=npm%20downloads
diff --git a/packages/web3-rpc-methods/package.json b/packages/web3-rpc-methods/package.json
index 25cc30c36ae..e708304cbbd 100644
--- a/packages/web3-rpc-methods/package.json
+++ b/packages/web3-rpc-methods/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3-rpc-methods",
+	"name": "@etn-sc/web3-rpc-methods",
 	"version": "1.1.3",
-	"description": "Ethereum RPC methods for Web3 4.x.x",
+	"description": "Electroneum RPC methods for Web3 4.x.x",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -56,8 +56,8 @@
 		"typescript": "^4.7.4"
 	},
 	"dependencies": {
-		"web3-core": "^4.3.0",
-		"web3-types": "^1.3.0",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-rpc-methods/src/eth_rpc_methods.ts b/packages/web3-rpc-methods/src/eth_rpc_methods.ts
index 2a027733dfb..911d3b44f84 100644
--- a/packages/web3-rpc-methods/src/eth_rpc_methods.ts
+++ b/packages/web3-rpc-methods/src/eth_rpc_methods.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 import {
 	Address,
 	BlockNumberOrTag,
@@ -27,9 +27,9 @@ import {
 	Uint,
 	Uint256,
 	Web3EthExecutionAPI,
-} from 'web3-types';
-import { Eip712TypedData } from 'web3-types/src/eth_types';
-import { validator } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { Eip712TypedData } from '@etn-sc/web3-types/src/eth_types';
+import { validator } from '@etn-sc/web3-validator';
 
 export async function getProtocolVersion(requestManager: Web3RequestManager) {
 	return requestManager.send({
diff --git a/packages/web3-rpc-methods/src/net_rpc_methods.ts b/packages/web3-rpc-methods/src/net_rpc_methods.ts
index 7b638cf59a9..aee05284682 100644
--- a/packages/web3-rpc-methods/src/net_rpc_methods.ts
+++ b/packages/web3-rpc-methods/src/net_rpc_methods.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3RequestManager } from 'web3-core';
-import { Web3NetAPI } from 'web3-types';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { Web3NetAPI } from '@etn-sc/web3-types';
 
 export async function getId(requestManager: Web3RequestManager<Web3NetAPI>) {
 	return requestManager.send({
diff --git a/packages/web3-rpc-methods/src/personal_rpc_methods.ts b/packages/web3-rpc-methods/src/personal_rpc_methods.ts
index c73e1c534ab..96d2d880c4f 100644
--- a/packages/web3-rpc-methods/src/personal_rpc_methods.ts
+++ b/packages/web3-rpc-methods/src/personal_rpc_methods.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3RequestManager } from 'web3-core';
-import { Address, EthPersonalAPI, HexString, Transaction } from 'web3-types';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { Address, EthPersonalAPI, HexString, Transaction } from '@etn-sc/web3-types';
 
 export const getAccounts = async (requestManager: Web3RequestManager<EthPersonalAPI>) =>
 	requestManager.send({
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/call.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/call.test.ts
index a40d68283a3..5b31a984b64 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/call.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/call.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/call';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('call', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_lll.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_lll.test.ts
index 77829a85376..3f36d954470 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_lll.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_lll.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/compile_lll';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('compileLLL', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_serpent.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_serpent.test.ts
index 2b1e2668319..4aadd9eb7cb 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_serpent.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_serpent.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/compile_lll';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('compileSerpent', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_solidity.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_solidity.test.ts
index 7587fa20c0f..425fa572af3 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_solidity.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/compile_solidity.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/compile_solidity';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('compileSolidity', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/createAccessList.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/createAccessList.test.ts
index f90aa6e9f0f..608a20160b4 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/createAccessList.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/createAccessList.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/createAccessList';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/estimate_gas.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/estimate_gas.test.ts
index b5873369e83..24aa86feaec 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/estimate_gas.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/estimate_gas.test.ts
@@ -29,13 +29,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/estimate_gas';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('estimateGas', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/call.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/call.ts
index 327a79fb8ba..8c604657966 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/call.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/call.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { TransactionCallAPI, BlockTags, BlockNumberOrTag } from 'web3-types';
+import { TransactionCallAPI, BlockTags, BlockNumberOrTag } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x5208';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/createAccessList.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/createAccessList.ts
index 536b6781b93..63b9fd347f4 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/createAccessList.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/createAccessList.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, TransactionWithSenderAPI } from 'web3-types';
+import { BlockNumberOrTag, BlockTags, TransactionWithSenderAPI } from '@etn-sc/web3-types';
 
 export const mockRpcResponse =
 	'{"accessList":[{"address":"0xc285289346689ee7cd63e4bb1a3b40f5f6e7973c","storageKeys":["0x0000000000000000000000000000000000000000000000000000000000000000"]}],"gasUsed":"0x6a5b"}';
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/estimate_gas.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/estimate_gas.ts
index 62f547eaa8b..600ccadde06 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/estimate_gas.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/estimate_gas.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionWithSenderAPI, BlockTags, BlockNumberOrTag } from 'web3-types';
+import { TransactionWithSenderAPI, BlockTags, BlockNumberOrTag } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x5208';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_balance.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_balance.ts
index bd9a6247798..061182a580a 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_balance.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_balance.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockTags, BlockNumberOrTag } from 'web3-types';
+import { Address, BlockTags, BlockNumberOrTag } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xe8d4a51000';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_hash.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_hash.ts
index 081b1192cd9..18d19fbf678 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_hash.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_hash.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_number.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_number.ts
index 421894fdbb7..24f28122be2 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_number.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_by_number.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags } from 'web3-types';
+import { BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_hash.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_hash.ts
index a6b485b1f86..f714af94ea0 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_hash.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_hash.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_number.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_number.ts
index 8bd2e8a04bb..8339c4320ec 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_number.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_block_transaction_count_by_number.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockTags, BlockNumberOrTag } from 'web3-types';
+import { BlockTags, BlockNumberOrTag } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_code.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_code.ts
index 78f2161f288..5d849ca9bef 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_code.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_code.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, BlockTags, BlockNumberOrTag } from 'web3-types';
+import { Address, BlockTags, BlockNumberOrTag } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_fee_history.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_fee_history.ts
index c7791a1fb34..60f3fcb79e4 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_fee_history.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_fee_history.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Uint } from 'web3-types';
+import { BlockNumberOrTag, BlockTags, Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_changes.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_changes.ts
index 34d9698d645..f3156651d3c 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_changes.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_changes.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Uint } from 'web3-types';
+import { Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_logs.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_logs.ts
index 34d9698d645..f3156651d3c 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_logs.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_filter_logs.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Uint } from 'web3-types';
+import { Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_logs.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_logs.ts
index c64dee22c6d..e766d463397 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_logs.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_logs.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Filter } from 'web3-types';
+import { Filter } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_proof.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_proof.ts
index e3963c3ece9..20ec85e8bbe 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_proof.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_proof.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, HexString32Bytes, Uint } from 'web3-types';
+import { Address, HexString32Bytes, Uint } from '@etn-sc/web3-types';
 
 const address = '0x407d73d8a49eeb85d32cf465507dd71d507100c1';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_storage_at.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_storage_at.ts
index a098e4e7b74..4245a5cbf26 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_storage_at.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_storage_at.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, Address, BlockTags, Uint256 } from 'web3-types';
+import { BlockNumberOrTag, Address, BlockTags, Uint256 } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x033456732123ffff2342342dd12342434324234234fd234fd23fd4f23d4234';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_hash_and_index.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_hash_and_index.ts
index ea70cfce63b..1330e60bd7f 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_hash_and_index.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_hash_and_index.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes, Uint } from 'web3-types';
+import { HexString32Bytes, Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_number_and_index.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_number_and_index.ts
index 006b65f6825..0e35cb6f62b 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_number_and_index.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_block_number_and_index.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags, Uint } from 'web3-types';
+import { BlockNumberOrTag, BlockTags, Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_hash.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_hash.ts
index daede4bf5d6..5664a8ef802 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_hash.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_by_hash.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_count.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_count.ts
index 78b2e69f4bb..968489fe01d 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_count.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_count.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, Address, BlockTags } from 'web3-types';
+import { BlockNumberOrTag, Address, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xe8d4a51000';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_receipt.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_receipt.ts
index 68b9639fe4f..8d9074042e0 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_receipt.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_transaction_receipt.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_by_block_hash_and_index.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_by_block_hash_and_index.ts
index 8577efe646b..b1857b4b6d9 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_by_block_hash_and_index.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_by_block_hash_and_index.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes, Uint } from 'web3-types';
+import { HexString32Bytes, Uint } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_hash.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_hash.ts
index 612ef639dce..7b29ae640e4 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_hash.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_hash.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_number.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_number.ts
index 40a2dfdf1d2..f059ef9017e 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_number.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/get_uncle_count_by_block_number.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { BlockNumberOrTag, BlockTags } from 'web3-types';
+import { BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/new_filter.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/new_filter.ts
index c64dee22c6d..e766d463397 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/new_filter.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/new_filter.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Filter } from 'web3-types';
+import { Filter } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_raw_transaction.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_raw_transaction.ts
index 1cc49936062..d463c74d7ce 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_raw_transaction.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_raw_transaction.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexStringBytes } from 'web3-types';
+import { HexStringBytes } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_transaction.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_transaction.ts
index 936b846966b..751da0a3be9 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_transaction.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/send_transaction.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionWithSenderAPI } from 'web3-types';
+import { TransactionWithSenderAPI } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x5208';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign.ts
index a56832aac05..70f06e6b014 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, HexStringBytes } from 'web3-types';
+import { Address, HexStringBytes } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0xb';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_transaction.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_transaction.ts
index 936b846966b..751da0a3be9 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_transaction.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_transaction.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionWithSenderAPI } from 'web3-types';
+import { TransactionWithSenderAPI } from '@etn-sc/web3-types';
 
 export const mockRpcResponse = '0x5208';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_typed_data.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_typed_data.ts
index 37a5ee3171e..61e0be62393 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_typed_data.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/sign_typed_data.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Address, Eip712TypedData } from 'web3-types';
+import { Address, Eip712TypedData } from '@etn-sc/web3-types';
 
 const address = '0x407d73d8a49eeb85d32cf465507dd71d507100c1';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_hashrate.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_hashrate.ts
index c41243ca1f3..fc5d64903f2 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_hashrate.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_hashrate.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes } from 'web3-types';
+import { HexString32Bytes } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_work.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_work.ts
index 3757f663920..3969d68a726 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_work.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/submit_work.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { HexString32Bytes, HexString8Bytes } from 'web3-types';
+import { HexString32Bytes, HexString8Bytes } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/uninstall_filter.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/uninstall_filter.ts
index 34d9698d645..f3156651d3c 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/uninstall_filter.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/fixtures/uninstall_filter.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Uint } from 'web3-types';
+import { Uint } from '@etn-sc/web3-types';
 
 /**
  * Array consists of:
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_accounts.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_accounts.test.ts
index 72ec86514bf..90a6970eeef 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_accounts.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_accounts.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_balance.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_balance.test.ts
index e4f83d8bfa2..ae79c71f4ff 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_balance.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_balance.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_balance';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getBalance', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_hash.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_hash.test.ts
index 782ba9e495f..42db897e3fa 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_hash.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_hash.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_block_by_hash';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getBlockByHash', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_number.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_number.test.ts
index 381991b4352..43f93347134 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_number.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_by_number.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_block_by_number';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getBlockByNumber', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_number.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_number.test.ts
index 14c4146c338..2d70737ad46 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_number.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_number.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_hash.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_hash.test.ts
index d8578c1f4e5..606b4899d27 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_hash.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_hash.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_block_transaction_count_by_hash';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getBlockTransactionCountByHash', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_number.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_number.test.ts
index 9e092f62d0b..c001e722a3d 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_number.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_block_transaction_count_by_number.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_block_transaction_count_by_number';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getBlockTransactionCountByNumber', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_chain_id.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_chain_id.test.ts
index d13e893a9a2..bd518bbde17 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_chain_id.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_chain_id.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_code.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_code.test.ts
index 4c0f7327998..f550d63a2e1 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_code.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_code.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_code';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getCode', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_coinbase.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_coinbase.test.ts
index 3f875870fa2..d73d4cc1da1 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_coinbase.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_coinbase.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_compilers.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_compilers.test.ts
index bcaf636f0db..6467890837f 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_compilers.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_compilers.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_fee_history.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_fee_history.test.ts
index f5578f68d57..fa73358a9ea 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_fee_history.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_fee_history.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_fee_history';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getFeeHistory', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_changes.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_changes.test.ts
index 418c28e3b73..c68c6023d11 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_changes.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_changes.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/uninstall_filter';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getFilterChanges', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_logs.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_logs.test.ts
index 81a6eb52b90..d097d58ce21 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_logs.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_filter_logs.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/uninstall_filter';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getFilterLogs', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_gas_price.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_gas_price.test.ts
index d96d1e04d3c..de9ad0ce3f0 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_gas_price.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_gas_price.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_hash_rate.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_hash_rate.test.ts
index 7c7efa8fd2d..7bd5b773d95 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_hash_rate.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_hash_rate.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_logs.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_logs.test.ts
index d850de4b330..409684561f9 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_logs.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_logs.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/new_filter';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getLogs', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_mining.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_mining.test.ts
index 47f3a968646..8ae25961a39 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_mining.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_mining.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_node_info.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_node_info.test.ts
index 41d56e89fbb..2c12665015c 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_node_info.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_node_info.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_pending_transaction.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_pending_transaction.test.ts
index 4d50d55b745..16dd072b365 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_pending_transaction.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_pending_transaction.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_proof.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_proof.test.ts
index ae67f83da50..07c9896efec 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_proof.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_proof.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_proof';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getProof', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_protocol_version.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_protocol_version.test.ts
index dd4943e2b29..a723d093646 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_protocol_version.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_protocol_version.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_storage_at.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_storage_at.test.ts
index 00eb96fa48b..e5a395f9826 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_storage_at.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_storage_at.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_storage_at';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getStorageAt', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_syncing.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_syncing.test.ts
index 176d25fe514..d6b5d486d34 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_syncing.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_syncing.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_hash_and_index.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_hash_and_index.test.ts
index 879021f974b..1877bc93341 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_hash_and_index.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_hash_and_index.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_transaction_by_block_hash_and_index';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getTransactionByBlockHashAndIndex', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_number_and_index.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_number_and_index.test.ts
index 25d37df2058..447cb78ba17 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_number_and_index.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_block_number_and_index.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_transaction_by_block_number_and_index';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getTransactionByBlockNumberAndIndex', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_hash.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_hash.test.ts
index f9041c60b6a..e973b71e0a9 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_hash.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_by_hash.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_transaction_by_hash';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getTransactionByHash', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_count.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_count.test.ts
index 6136449a8d0..dd2941e3de2 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_count.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_count.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_transaction_count';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getTransactionCount', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_receipt.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_receipt.test.ts
index a0be658ec07..f65538b7aca 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_receipt.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_transaction_receipt.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_transaction_receipt';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getTransactionReceipt', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_by_block_hash_and_index.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_by_block_hash_and_index.test.ts
index 11ffc9e7b97..802c5ac4e8d 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_by_block_hash_and_index.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_by_block_hash_and_index.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_uncle_by_block_hash_and_index';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getUncleByBlockHashAndIndex', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_hash.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_hash.test.ts
index be943e95e93..8e2b774c88b 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_hash.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_hash.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_uncle_count_by_block_hash';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getUncleCountByBlockHash', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_number.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_number.test.ts
index f9e0c6fb0b7..24936fc8eff 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_number.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_uncle_count_by_block_number.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/get_uncle_count_by_block_number';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('getUncleCountByBlockNumber', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_work.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_work.test.ts
index ea3dbfca890..3206151d691 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_work.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/get_work.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_block_filter.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_block_filter.test.ts
index 47d702a1be1..7c4bb0fa930 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_block_filter.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_block_filter.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_filter.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_filter.test.ts
index fbcfe892a27..19418c7cdb3 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_filter.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_filter.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/new_filter';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('newFilter', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_pending_transaction_filter.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_pending_transaction_filter.test.ts
index bd31ab4184d..f1567d86644 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_pending_transaction_filter.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/new_pending_transaction_filter.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/request_accounts.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/request_accounts.test.ts
index 5149ed5b32e..cae336442ea 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/request_accounts.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/request_accounts.test.ts
@@ -28,7 +28,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
+import { Web3RequestManager } from '@etn-sc/web3-core';
 
 import { ethRpcMethods } from '../../../src/index';
 
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_raw_transaction.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_raw_transaction.test.ts
index 2a4dea00ae0..c490bc666de 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_raw_transaction.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_raw_transaction.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/send_raw_transaction';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('sendRawTransaction', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_transaction.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_transaction.test.ts
index 6e916be8904..3b22ae054d4 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_transaction.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/send_transaction.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/send_transaction';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('sendTransaction', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign.test.ts
index 634135faebf..0d41b59e4a7 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/sign';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('sign', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_transaction.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_transaction.test.ts
index 861efac5998..c5c4b1868b6 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_transaction.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_transaction.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/sign_transaction';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('signTransaction', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_typed_data.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_typed_data.test.ts
index a9674a8d381..7b9f945683b 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_typed_data.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/sign_typed_data.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/sign_typed_data';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('signTypedData', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_hashrate.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_hashrate.test.ts
index a933733f0be..a0d94905283 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_hashrate.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_hashrate.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/submit_hashrate';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('submitHashrate', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_work.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_work.test.ts
index 6ec44aa6fef..21f86349503 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_work.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/submit_work.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/submit_work';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('submitWork', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/uninstall_filter.test.ts b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/uninstall_filter.test.ts
index 10fda048587..1fd893ab9bc 100644
--- a/packages/web3-rpc-methods/test/unit/eth_rpc_methods/uninstall_filter.test.ts
+++ b/packages/web3-rpc-methods/test/unit/eth_rpc_methods/uninstall_filter.test.ts
@@ -28,13 +28,13 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // You should have received a copy of the GNU Lesser General Public License
 // along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 // */
-import { Web3RequestManager } from 'web3-core';
-import { validator } from 'web3-validator';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { validator } from '@etn-sc/web3-validator';
 
 import { ethRpcMethods } from '../../../src/index';
 import { testData } from './fixtures/uninstall_filter';
 
-jest.mock('web3-validator');
+jest.mock('@etn-sc/web3-validator');
 
 describe('uninstallFilter', () => {
 	let requestManagerSendSpy: jest.Mock;
diff --git a/packages/web3-rpc-methods/test/unit/net_rpc_methods.test.ts b/packages/web3-rpc-methods/test/unit/net_rpc_methods.test.ts
index 588600a1ce1..3287bc04b37 100644
--- a/packages/web3-rpc-methods/test/unit/net_rpc_methods.test.ts
+++ b/packages/web3-rpc-methods/test/unit/net_rpc_methods.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3RequestManager } from 'web3-core';
-import { Web3NetAPI } from 'web3-types';
+import { Web3RequestManager } from '@etn-sc/web3-core';
+import { Web3NetAPI } from '@etn-sc/web3-types';
 
 import { netRpcMethods } from '../../src/index';
 
diff --git a/packages/web3-types/README.md b/packages/web3-types/README.md
index 7c15e2dc2e0..7c0990717cf 100644
--- a/packages/web3-types/README.md
+++ b/packages/web3-types/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-types` contains the common data structures and interfaces used in [web3.js][repo].
+`@etn-sc/web3-types` contains the common data structures and interfaces used in [web3.js][repo].
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-types) or using [Yarn](https://yarnpkg.com/package/web3-types)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-types)
 
 ### Using NPM
 
 ```bash
-npm install web3-types
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-types
+npm install @etn-sc/web3-types
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-types
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-types
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-types
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-types%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-types
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-types
 [downloads-image]: https://img.shields.io/npm/dm/web3-types?label=npm%20downloads
diff --git a/packages/web3-types/package.json b/packages/web3-types/package.json
index d42252af9b8..03effbcc5a2 100644
--- a/packages/web3-types/package.json
+++ b/packages/web3-types/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-types",
+	"name": "@etn-sc/web3-types",
 	"version": "1.3.1",
 	"description": "Provide the common data structures and interfaces for web3 modules.",
 	"main": "./lib/commonjs/index.js",
@@ -11,8 +11,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
diff --git a/packages/web3-types/src/eth_types.ts b/packages/web3-types/src/eth_types.ts
index 8c59752e20a..5f1e285bb9f 100644
--- a/packages/web3-types/src/eth_types.ts
+++ b/packages/web3-types/src/eth_types.ts
@@ -383,6 +383,9 @@ interface TransactionBase {
 	v?: Numbers;
 	r?: Bytes;
 	s?: Bytes;
+	pV?: Numbers;
+    pR?: Bytes;
+    pS?: Bytes;
 }
 
 export interface Transaction extends TransactionBase {
diff --git a/packages/web3-utils/README.md b/packages/web3-utils/README.md
index 78cce56e322..8fedb62c308 100644
--- a/packages/web3-utils/README.md
+++ b/packages/web3-utils/README.md
@@ -9,30 +9,24 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-utils` This contains useful utility functions for Dapp developers.
+`@etn-sc/web3-utils` This contains useful utility functions for Dapp developers.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-utils) or using [Yarn](https://yarnpkg.com/package/web3-utils)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-utils)
 
 ### Using NPM
 
 ```bash
-npm install web3-utils
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-utils
+npm install @etn-sc/web3-utils
 ```
 
 ## Usage
 
 ```js
-const Web3Utils = require('web3-utils');
+const Web3Utils = require('@etn-sc/web3-utils');
 console.log(Web3Utils);
 {
     sha3: function(){},
@@ -44,8 +38,7 @@ console.log(Web3Utils);
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -66,7 +59,7 @@ console.log(Web3Utils);
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-utils
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-utils
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-utils%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-utils
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-utils
 [downloads-image]: https://img.shields.io/npm/dm/web3-utils?label=npm%20downloads
diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json
index a4d48ca5cf4..a21e04db323 100644
--- a/packages/web3-utils/package.json
+++ b/packages/web3-utils/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-utils",
+	"name": "@etn-sc/web3-utils",
 	"sideEffects": false,
 	"version": "4.0.7",
 	"description": "Collection of utility functions used in web3.js.",
@@ -12,8 +12,8 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -64,8 +64,8 @@
 	},
 	"dependencies": {
 		"ethereum-cryptography": "^2.0.0",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3-utils/src/chunk_response_parser.ts b/packages/web3-utils/src/chunk_response_parser.ts
index d9b37c7b6ee..8aecc3e1fb7 100644
--- a/packages/web3-utils/src/chunk_response_parser.ts
+++ b/packages/web3-utils/src/chunk_response_parser.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { JsonRpcResponse } from 'web3-types';
-import { InvalidResponseError } from 'web3-errors';
+import { JsonRpcResponse } from '@etn-sc/web3-types';
+import { InvalidResponseError } from '@etn-sc/web3-errors';
 import { EventEmitter } from 'events';
 import { Timeout } from './promise_helpers.js';
 
diff --git a/packages/web3-utils/src/converters.ts b/packages/web3-utils/src/converters.ts
index 4e5f8592f77..d63eeaca2ab 100644
--- a/packages/web3-utils/src/converters.ts
+++ b/packages/web3-utils/src/converters.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
 import { bytesToUtf8, utf8ToBytes as ecUtf8ToBytes } from 'ethereum-cryptography/utils.js';
-import { Address, Bytes, HexString, Numbers, ValueTypes } from 'web3-types';
+import { Address, Bytes, HexString, Numbers, ValueTypes } from '@etn-sc/web3-types';
 import {
 	isAddress,
 	isHex,
@@ -27,7 +27,7 @@ import {
 	utils,
 	utils as validatorUtils,
 	validator,
-} from 'web3-validator';
+} from '@etn-sc/web3-validator';
 
 import {
 	HexProcessingError,
@@ -36,7 +36,7 @@ import {
 	InvalidBytesError,
 	InvalidNumberError,
 	InvalidUnitError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 
 // Ref: https://ethdocs.org/en/latest/ether.html
 // Note: this could be simplified using ** operator, but babel does not handle it well (https://github.com/babel/babel/issues/13109)
diff --git a/packages/web3-utils/src/formatter.ts b/packages/web3-utils/src/formatter.ts
index 0cfeb600b9a..0a9426a91bd 100644
--- a/packages/web3-utils/src/formatter.ts
+++ b/packages/web3-utils/src/formatter.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { FormatterError } from 'web3-errors';
-import { Bytes, DataFormat, FMT_BYTES, FMT_NUMBER, FormatType } from 'web3-types';
-import { isNullish, isObject, JsonSchema, utils, ValidationSchemaInput } from 'web3-validator';
+import { FormatterError } from '@etn-sc/web3-errors';
+import { Bytes, DataFormat, FMT_BYTES, FMT_NUMBER, FormatType } from '@etn-sc/web3-types';
+import { isNullish, isObject, JsonSchema, utils, ValidationSchemaInput } from '@etn-sc/web3-validator';
 import { bytesToUint8Array, bytesToHex, numberToHex, toBigInt } from './converters.js';
 import { mergeDeep } from './objects.js';
 import { padLeft } from './string_manipulation.js';
diff --git a/packages/web3-utils/src/hash.ts b/packages/web3-utils/src/hash.ts
index 92396116f0b..3f63eb0117c 100644
--- a/packages/web3-utils/src/hash.ts
+++ b/packages/web3-utils/src/hash.ts
@@ -25,7 +25,7 @@ import {
 	InvalidSizeError,
 	InvalidStringError,
 	InvalidUnsignedIntegerError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import {
 	Bytes,
 	EncodingTypes,
@@ -33,8 +33,8 @@ import {
 	Sha3Input,
 	TypedObject,
 	TypedObjectAbbreviated,
-} from 'web3-types';
-import { isAddress, isNullish, isHexStrict } from 'web3-validator';
+} from '@etn-sc/web3-types';
+import { isAddress, isNullish, isHexStrict } from '@etn-sc/web3-validator';
 import {
 	bytesToUint8Array,
 	bytesToHex,
diff --git a/packages/web3-utils/src/json_rpc.ts b/packages/web3-utils/src/json_rpc.ts
index 573d39197e3..8a0425b6923 100644
--- a/packages/web3-utils/src/json_rpc.ts
+++ b/packages/web3-utils/src/json_rpc.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { isNullish } from 'web3-validator';
+import { isNullish } from '@etn-sc/web3-validator';
 import {
 	JsonRpcPayload,
 	JsonRpcResponse,
@@ -27,8 +27,8 @@ import {
 	JsonRpcRequest,
 	JsonRpcBatchResponse,
 	JsonRpcSubscriptionResult,
-} from 'web3-types';
-import { rpcErrorsMap } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { rpcErrorsMap } from '@etn-sc/web3-errors';
 import { uuidV4 } from './uuid.js';
 
 // check if code is a valid rpc server error code
diff --git a/packages/web3-utils/src/objects.ts b/packages/web3-utils/src/objects.ts
index 4ed6c328ef8..9a90cc9adb7 100644
--- a/packages/web3-utils/src/objects.ts
+++ b/packages/web3-utils/src/objects.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { TypedArray } from 'web3-types';
-import { isNullish } from 'web3-validator';
+import { TypedArray } from '@etn-sc/web3-types';
+import { isNullish } from '@etn-sc/web3-validator';
 
 const isIterable = (item: unknown): item is Record<string, unknown> =>
 	typeof item === 'object' &&
diff --git a/packages/web3-utils/src/promise_helpers.ts b/packages/web3-utils/src/promise_helpers.ts
index c8e211fbbb7..99887d1711f 100644
--- a/packages/web3-utils/src/promise_helpers.ts
+++ b/packages/web3-utils/src/promise_helpers.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { isNullish } from 'web3-validator';
+import { isNullish } from '@etn-sc/web3-validator';
 
 export type Timer = ReturnType<typeof setInterval>;
 export type Timeout = ReturnType<typeof setTimeout>;
diff --git a/packages/web3-utils/src/socket_provider.ts b/packages/web3-utils/src/socket_provider.ts
index 380c230bd72..6c734ac1fca 100644
--- a/packages/web3-utils/src/socket_provider.ts
+++ b/packages/web3-utils/src/socket_provider.ts
@@ -38,7 +38,7 @@ import {
 	Web3ProviderEventCallback,
 	Web3ProviderMessageEventCallback,
 	Web3ProviderStatus,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import {
 	ConnectionError,
 	ConnectionNotOpenError,
@@ -47,7 +47,7 @@ import {
 	PendingRequestsOnReconnectingError,
 	RequestAlreadySentError,
 	Web3WSProviderError,
-} from 'web3-errors';
+} from '@etn-sc/web3-errors';
 import { Eip1193Provider } from './web3_eip1193_provider.js';
 import { ChunkResponseParser } from './chunk_response_parser.js';
 import { isNullish } from './validation.js';
diff --git a/packages/web3-utils/src/string_manipulation.ts b/packages/web3-utils/src/string_manipulation.ts
index b7d0371d0b1..be28fb76df4 100644
--- a/packages/web3-utils/src/string_manipulation.ts
+++ b/packages/web3-utils/src/string_manipulation.ts
@@ -15,9 +15,9 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Numbers } from 'web3-types';
-import { NibbleWidthError } from 'web3-errors';
-import { isHexStrict, validator, utils as validatorUtils, bigintPower } from 'web3-validator';
+import { Numbers } from '@etn-sc/web3-types';
+import { NibbleWidthError } from '@etn-sc/web3-errors';
+import { isHexStrict, validator, utils as validatorUtils, bigintPower } from '@etn-sc/web3-validator';
 import { numberToHex, toHex, toNumber } from './converters.js';
 
 /**
diff --git a/packages/web3-utils/src/validation.ts b/packages/web3-utils/src/validation.ts
index 37d5fb5257b..9f6283c4f52 100644
--- a/packages/web3-utils/src/validation.ts
+++ b/packages/web3-utils/src/validation.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { InvalidBlockError } from 'web3-errors';
+import { InvalidBlockError } from '@etn-sc/web3-errors';
 import {
 	checkAddressCheckSum as checkAddressCheckSumValidator,
 	isAddress as isAddressValidator,
@@ -29,8 +29,8 @@ import {
 	isTopic as isTopicValidator,
 	isTopicInBloom as isTopicInBloomValidator,
 	isUserEthereumAddressInBloom as isUserEthereumAddressInBloomValidator,
-} from 'web3-validator';
-import { BlockNumberOrTag, BlockTags } from 'web3-types';
+} from '@etn-sc/web3-validator';
+import { BlockNumberOrTag, BlockTags } from '@etn-sc/web3-types';
 
 /**
  * @deprecated Will be removed in next release. Please use `web3-validator` package instead.
diff --git a/packages/web3-utils/src/web3_deferred_promise.ts b/packages/web3-utils/src/web3_deferred_promise.ts
index 01805b774be..3cc2824240c 100644
--- a/packages/web3-utils/src/web3_deferred_promise.ts
+++ b/packages/web3-utils/src/web3_deferred_promise.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { OperationTimeoutError } from 'web3-errors';
-import { Web3DeferredPromiseInterface } from 'web3-types';
+import { OperationTimeoutError } from '@etn-sc/web3-errors';
+import { Web3DeferredPromiseInterface } from '@etn-sc/web3-types';
 import { Timeout } from './promise_helpers.js';
 
 /**
diff --git a/packages/web3-utils/src/web3_eip1193_provider.ts b/packages/web3-utils/src/web3_eip1193_provider.ts
index 15f132f6215..a0c9fa8dca3 100644
--- a/packages/web3-utils/src/web3_eip1193_provider.ts
+++ b/packages/web3-utils/src/web3_eip1193_provider.ts
@@ -22,9 +22,9 @@ import {
 	Web3APIPayload,
 	Web3APISpec,
 	Web3BaseProvider,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { EventEmitter } from 'events';
-import { EIP1193ProviderRpcError } from 'web3-errors';
+import { EIP1193ProviderRpcError } from '@etn-sc/web3-errors';
 import { toPayload } from './json_rpc.js';
 
 /**
diff --git a/packages/web3-utils/test/fixtures/converters.ts b/packages/web3-utils/test/fixtures/converters.ts
index 42d992ec34a..0b708a92ef2 100644
--- a/packages/web3-utils/test/fixtures/converters.ts
+++ b/packages/web3-utils/test/fixtures/converters.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address, Bytes, HexString, Numbers, ValueTypes } from 'web3-types';
+import { Address, Bytes, HexString, Numbers, ValueTypes } from '@etn-sc/web3-types';
 import { EtherUnits, hexToBytes } from '../../src/converters';
 
 export const bytesToHexValidData: [Bytes, HexString][] = [
diff --git a/packages/web3-utils/test/fixtures/formatter.ts b/packages/web3-utils/test/fixtures/formatter.ts
index 7437373d708..4fafe2b198b 100644
--- a/packages/web3-utils/test/fixtures/formatter.ts
+++ b/packages/web3-utils/test/fixtures/formatter.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { FMT_NUMBER, FMT_BYTES } from 'web3-types';
+import { FMT_NUMBER, FMT_BYTES } from '@etn-sc/web3-types';
 import { hexToBytes } from '../../src/converters';
 
 export const isDataFormatValid: [any, boolean][] = [
diff --git a/packages/web3-utils/test/fixtures/hash.ts b/packages/web3-utils/test/fixtures/hash.ts
index 6bfe9f63f33..b5270a3971e 100644
--- a/packages/web3-utils/test/fixtures/hash.ts
+++ b/packages/web3-utils/test/fixtures/hash.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { TypedObject, TypedObjectAbbreviated, Bytes, Sha3Input } from 'web3-types';
+import { TypedObject, TypedObjectAbbreviated, Bytes, Sha3Input } from '@etn-sc/web3-types';
 import { hexToBytes } from '../../src/converters';
 
 export const sha3Data: [Bytes, string | undefined][] = [
diff --git a/packages/web3-utils/test/fixtures/json_rpc.ts b/packages/web3-utils/test/fixtures/json_rpc.ts
index 516711abceb..67df351526b 100644
--- a/packages/web3-utils/test/fixtures/json_rpc.ts
+++ b/packages/web3-utils/test/fixtures/json_rpc.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { JsonRpcNotification, SubscriptionParams } from 'web3-types';
+import { JsonRpcNotification, SubscriptionParams } from '@etn-sc/web3-types';
 
 const responseWithResult = { jsonrpc: '2.0', id: 1, result: '' };
 const responseWithError = { jsonrpc: '2.0', id: 1, error: { code: 1, message: 'string' } };
diff --git a/packages/web3-utils/test/fixtures/string_manipulation.ts b/packages/web3-utils/test/fixtures/string_manipulation.ts
index be5b298c803..20689979521 100644
--- a/packages/web3-utils/test/fixtures/string_manipulation.ts
+++ b/packages/web3-utils/test/fixtures/string_manipulation.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { HexString, Numbers } from 'web3-types';
+import { HexString, Numbers } from '@etn-sc/web3-types';
 
 export const padLeftData: [[Numbers, number, string], HexString][] = [
 	[[0, 10, '0'], '0x0000000000'],
diff --git a/packages/web3-utils/test/fixtures/validation.ts b/packages/web3-utils/test/fixtures/validation.ts
index ec88e4fcb12..64b601f611a 100644
--- a/packages/web3-utils/test/fixtures/validation.ts
+++ b/packages/web3-utils/test/fixtures/validation.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Numbers } from 'web3-types';
-import { InvalidBlockError } from 'web3-errors';
+import { Numbers } from '@etn-sc/web3-types';
+import { InvalidBlockError } from '@etn-sc/web3-errors';
 
 export const compareBlockNumbersValidData: [[Numbers, Numbers], number][] = [
 	[[1, 1], 0],
diff --git a/packages/web3-utils/test/unit/formatter.test.ts b/packages/web3-utils/test/unit/formatter.test.ts
index b58f5459584..99c709094cb 100644
--- a/packages/web3-utils/test/unit/formatter.test.ts
+++ b/packages/web3-utils/test/unit/formatter.test.ts
@@ -23,7 +23,7 @@ import {
 	FormatType,
 	HexString,
 	Numbers,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 import { expectTypeOf, typecheck } from '@humeris/espresso-shot';
 import { isDataFormatValid, convertScalarValueValid } from '../fixtures/formatter';
 import { format, isDataFormat, convertScalarValue } from '../../src/formatter';
diff --git a/packages/web3-utils/test/unit/socket_provider.test.ts b/packages/web3-utils/test/unit/socket_provider.test.ts
index 9c20df7fdd3..a853a4fc7d0 100644
--- a/packages/web3-utils/test/unit/socket_provider.test.ts
+++ b/packages/web3-utils/test/unit/socket_provider.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3APIPayload, EthExecutionAPI, JsonRpcResponse, Web3ProviderStatus } from 'web3-types';
+import { Web3APIPayload, EthExecutionAPI, JsonRpcResponse, Web3ProviderStatus } from '@etn-sc/web3-types';
 import { EventEmitter } from '../../src/event_emitter';
 // eslint-disable-next-line import/no-relative-packages
 import { sleep } from '../../../../fixtures/utils';
diff --git a/packages/web3-utils/test/unit/validation.test.ts b/packages/web3-utils/test/unit/validation.test.ts
index 84e9280bf8e..da8eb58b140 100644
--- a/packages/web3-utils/test/unit/validation.test.ts
+++ b/packages/web3-utils/test/unit/validation.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable jest/no-conditional-expect */
 
-import { InvalidBlockError } from 'web3-errors';
+import { InvalidBlockError } from '@etn-sc/web3-errors';
 import { compareBlockNumbers } from '../../src/validation';
 import {
 	compareBlockNumbersInvalidData,
diff --git a/packages/web3-validator/README.md b/packages/web3-validator/README.md
index 8096002bd59..fab7e9e3441 100644
--- a/packages/web3-validator/README.md
+++ b/packages/web3-validator/README.md
@@ -9,37 +9,29 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-validator` contains functions for validating objects.
+`@etn-sc/web3-validator` contains functions for validating objects.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-validator) or using [Yarn](https://yarnpkg.com/package/web3-validator)
-
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-validator)
 ### Using NPM
 
 ```bash
-npm install web3-validator
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-validator
+npm install @etn-sc/web3-validator
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ### Usage
 
 You can use the the validator by importing as and using to validate;
 
 ```ts
-import { validator } from 'web3-validator';
+import { validator } from '@etn-sc/web3-validator';
 
 // To validate and throw
 validator.validate(['uint8', 'string'], [val1, val2]);
@@ -92,7 +84,7 @@ The implementation of the validator is extension of [JSON-Schema-Draft07](https:
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3-validator
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-validator
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-validator%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-validator
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-validator
 [downloads-image]: https://img.shields.io/npm/dm/web3-validator?label=npm%20downloads
diff --git a/packages/web3-validator/package.json b/packages/web3-validator/package.json
index 483ac6237aa..39ad50fdded 100644
--- a/packages/web3-validator/package.json
+++ b/packages/web3-validator/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "web3-validator",
+	"name": "@etn-sc/web3-validator",
 	"version": "2.0.3",
 	"description": "JSON-Schema compatible validator for web3",
 	"main": "./lib/commonjs/index.js",
@@ -12,8 +12,8 @@
 		}
 	},
 	"browser": "./dist/web3-validator.min.js",
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
@@ -47,8 +47,8 @@
 	"dependencies": {
 		"ethereum-cryptography": "^2.0.0",
 		"util": "^0.12.5",
-		"web3-errors": "^1.1.3",
-		"web3-types": "^1.3.0",
+		"@etn-sc/web3-errors": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.0",
 		"zod": "^3.21.4"
 	},
 	"devDependencies": {
diff --git a/packages/web3-validator/src/errors.ts b/packages/web3-validator/src/errors.ts
index 8faf361248b..31d5e1a7cf1 100644
--- a/packages/web3-validator/src/errors.ts
+++ b/packages/web3-validator/src/errors.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { BaseWeb3Error, ERR_VALIDATION } from 'web3-errors';
-import { Web3ValidationErrorObject } from 'web3-types';
+import { BaseWeb3Error, ERR_VALIDATION } from '@etn-sc/web3-errors';
+import { Web3ValidationErrorObject } from '@etn-sc/web3-types';
 
 const errorFormatter = (error: Web3ValidationErrorObject): string => {
 	if (error.message) {
diff --git a/packages/web3-validator/src/formats.ts b/packages/web3-validator/src/formats.ts
index 69d6fa9cf1f..32190f7f6f3 100644
--- a/packages/web3-validator/src/formats.ts
+++ b/packages/web3-validator/src/formats.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Filter } from 'web3-types';
+import { Filter } from '@etn-sc/web3-types';
 import { ValidInputTypes } from './types.js';
 import { isAddress } from './validation/address.js';
 import { isBlockNumber, isBlockNumberOrTag, isBlockTag } from './validation/block.js';
diff --git a/packages/web3-validator/src/types.ts b/packages/web3-validator/src/types.ts
index 1a179e83b58..0ea347821fe 100644
--- a/packages/web3-validator/src/types.ts
+++ b/packages/web3-validator/src/types.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter } from 'web3-types';
+import { AbiParameter } from '@etn-sc/web3-types';
 import { ZodIssueBase } from 'zod';
 
 export type ValidInputTypes = Uint8Array | bigint | string | number | boolean;
diff --git a/packages/web3-validator/src/utils.ts b/packages/web3-validator/src/utils.ts
index 28270c99c3d..c2925b1f2ea 100644
--- a/packages/web3-validator/src/utils.ts
+++ b/packages/web3-validator/src/utils.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { InvalidBytesError, InvalidNumberError } from 'web3-errors';
+import { InvalidBytesError, InvalidNumberError } from '@etn-sc/web3-errors';
 import { VALID_ETH_BASE_TYPES } from './constants.js';
 import {
 	FullValidationSchema,
diff --git a/packages/web3-validator/src/validation/abi.ts b/packages/web3-validator/src/validation/abi.ts
index 52e835db63a..63ba9c3ae73 100644
--- a/packages/web3-validator/src/validation/abi.ts
+++ b/packages/web3-validator/src/validation/abi.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { AbiParameter } from 'web3-types';
+import { AbiParameter } from '@etn-sc/web3-types';
 // eslint-disable-next-line require-extensions/require-extensions
 import { ShortValidationSchema } from '../types';
 
diff --git a/packages/web3-validator/src/validation/block.ts b/packages/web3-validator/src/validation/block.ts
index 695ac3e3bbe..9c7ea48499a 100644
--- a/packages/web3-validator/src/validation/block.ts
+++ b/packages/web3-validator/src/validation/block.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { BlockTags } from 'web3-types';
+import { BlockTags } from '@etn-sc/web3-types';
 import { isUInt } from './numbers.js';
 
 export const isBlockNumber = (value: string | number | bigint): boolean => isUInt(value);
diff --git a/packages/web3-validator/src/validation/filter.ts b/packages/web3-validator/src/validation/filter.ts
index 2f13f08dbbf..8d367c85094 100644
--- a/packages/web3-validator/src/validation/filter.ts
+++ b/packages/web3-validator/src/validation/filter.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Filter } from 'web3-types';
+import { Filter } from '@etn-sc/web3-types';
 import { isAddress } from './address.js';
 import { isBlockNumberOrTag } from './block.js';
 import { isNullish } from './object.js';
diff --git a/packages/web3-validator/src/validation/object.ts b/packages/web3-validator/src/validation/object.ts
index 1d1aba0a36e..2f6c8d7dca6 100644
--- a/packages/web3-validator/src/validation/object.ts
+++ b/packages/web3-validator/src/validation/object.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { TypedArray } from 'web3-types';
+import { TypedArray } from '@etn-sc/web3-types';
 
 // Explicitly check for the
 // eslint-disable-next-line @typescript-eslint/ban-types
diff --git a/packages/web3-validator/src/validator.ts b/packages/web3-validator/src/validator.ts
index d477a06d96b..b59edf1b286 100644
--- a/packages/web3-validator/src/validator.ts
+++ b/packages/web3-validator/src/validator.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SchemaFormatError } from 'web3-errors';
-import { Web3ValidationErrorObject } from 'web3-types';
+import { SchemaFormatError } from '@etn-sc/web3-errors';
+import { Web3ValidationErrorObject } from '@etn-sc/web3-types';
 
 import { z, ZodType, ZodIssue, ZodIssueCode, ZodTypeAny } from 'zod';
 
diff --git a/packages/web3-validator/src/web3_validator.ts b/packages/web3-validator/src/web3_validator.ts
index a165a36bef1..d23f5bcf70a 100644
--- a/packages/web3-validator/src/web3_validator.ts
+++ b/packages/web3-validator/src/web3_validator.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3ValidationErrorObject } from 'web3-types';
+import { Web3ValidationErrorObject } from '@etn-sc/web3-types';
 
 import { Validator } from './validator.js';
 import { ethAbiToJsonSchema } from './utils.js';
diff --git a/packages/web3-validator/test/fixtures/validation.ts b/packages/web3-validator/test/fixtures/validation.ts
index 6dc6b4c7388..a2872ee08e2 100644
--- a/packages/web3-validator/test/fixtures/validation.ts
+++ b/packages/web3-validator/test/fixtures/validation.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Filter } from 'web3-types';
+import { Filter } from '@etn-sc/web3-types';
 import { hexToBytes } from 'ethereum-cryptography/utils';
 import { ValidInputTypes } from '../../src/types';
 
diff --git a/packages/web3-validator/test/unit/error.test.ts b/packages/web3-validator/test/unit/error.test.ts
index 14cf631c7c5..c06426fdec5 100644
--- a/packages/web3-validator/test/unit/error.test.ts
+++ b/packages/web3-validator/test/unit/error.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3ValidationErrorObject } from 'web3-types';
+import { Web3ValidationErrorObject } from '@etn-sc/web3-types';
 
 import { Web3ValidatorError } from '../../src/errors';
 import {
diff --git a/packages/web3-validator/test/unit/utils.test.ts b/packages/web3-validator/test/unit/utils.test.ts
index eac7d652bbf..6535a2a96bb 100644
--- a/packages/web3-validator/test/unit/utils.test.ts
+++ b/packages/web3-validator/test/unit/utils.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { InvalidNumberError, InvalidBytesError } from 'web3-errors';
+import { InvalidNumberError, InvalidBytesError } from '@etn-sc/web3-errors';
 import { ValidInputTypes } from '../../src/types';
 import {
 	ethAbiToJsonSchema,
diff --git a/packages/web3-validator/test/unit/web3_validator.test.ts b/packages/web3-validator/test/unit/web3_validator.test.ts
index 0b910c31f17..186c7d0826b 100644
--- a/packages/web3-validator/test/unit/web3_validator.test.ts
+++ b/packages/web3-validator/test/unit/web3_validator.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { SchemaFormatError } from 'web3-errors'
+import { SchemaFormatError } from '@etn-sc/web3-errors'
 import { abiToJsonSchemaCases } from '../fixtures/abi_to_json_schema';
 import { Web3Validator } from '../../src/web3_validator';
 import { Web3ValidatorError } from '../../src/errors';
diff --git a/packages/web3/README.md b/packages/web3/README.md
index bec916e563d..a7c41753d3e 100644
--- a/packages/web3/README.md
+++ b/packages/web3/README.md
@@ -9,30 +9,22 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is the main package of [web3.js](repo).
+This is the main package of [@etn-sc/web3.js](repo).
 
-`web3` contains the ideal setup for a Web3.js package.
+`@etn-sc/web3` contains the ideal setup for a Web3.js package.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3) or using [Yarn](https://yarnpkg.com/package/web3)
-
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3)
 ### Using NPM
 
 ```bash
-npm install web3
-```
-
-### Using Yarn
-
-```bash
-yarn add web3
+npm install @etn-sc/web3
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -63,27 +55,27 @@ We encourage users to use only required individual packages listed in following
 
 | Package                                                                                           | Version                                                                                                                                                                           | License                                                                                                               | Docs                                                                                                           | Description                                                                                                   |
 | ------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
-| [web3](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3)                               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3%2Fpackage.json)](https://www.npmjs.com/package/web3)                               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3)                | :rotating_light: Entire Web3.js offering (includes all packages)                                              |
-| [web3-core](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-core)                     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-core%2Fpackage.json)](https://www.npmjs.com/package/web3-core)                     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-core)           | Core functions for web3.js packages                                                                           |
-| [web3-errors](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-errors)                 | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-errors%2Fpackage.json)](https://www.npmjs.com/package/web3-core)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-errors)         | Errors Objects                                                                                                |
-| [web3-eth](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth)                       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth%2Fpackage.json)](https://www.npmjs.com/package/web3-eth)                       | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth)            | Modules to interact with the Ethereum blockchain and smart contracts                                          |
-| [web3-eth-abi](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-abi)               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-abi%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-abi)               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-abi)        | Functions for encoding and decoding EVM in/output                                                             |
-| [web3-eth-accounts](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-accounts)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-accounts%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-accounts)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-accounts)   | Functions for managing Ethereum accounts and signing                                                          |
-| [web3-eth-contract](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-contract)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-contract%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-contract)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-contract)   | The contract package contained in [web3-eth](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth) |
-| [web3-eth-ens](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-ens)               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-ens%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-ens)               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-ens)        | Functions for interacting with the Ethereum Name Service                                                      |
-| [web3-eth-iban](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-iban)             | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-iban%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-iban)             | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-iban)       | Functionality for converting Ethereum addressed to IBAN addressed and vice versa                              |
-| [web3-eth-personal](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-eth-personal)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-personal%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-personal)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-personal)   | Module to interact with the Ethereum blockchain accounts stored in the node                                   |
-| [web3-net](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-net)                       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-net%2Fpackage.json)](https://www.npmjs.com/package/web3-net)                       | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-net)            | Functions to interact with an Ethereum node's network properties                                              |
-| [web3-providers-http](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-providers-http) | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-http%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-http) | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-http) | Web3.js provider for the HTTP protocol                                                                        |
-| [web3-providers-ipc](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-providers-ipc)   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ipc%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-ipc)   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-ipc)  | Web3.js provider for IPC                                                                                      |
-| [web3-providers-ws](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-providers-ws)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ws%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-ws)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-ws)   | Web3.js provider for the Websocket protocol                                                                   |
-| [web3-rpc-methods](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-rpc-methods)       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-rpc-methods%2Fpackage.json)](https://www.npmjs.com/package/web3-types)             | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/)                    | RPC Methods                                                                                                   |
-| [web3-types](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-types)                   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-types%2Fpackage.json)](https://www.npmjs.com/package/web3-types)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-types)          | Shared useable types                                                                                          |
-| [web3-utils](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-utils)                   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-utils%2Fpackage.json)](https://www.npmjs.com/package/web3-utils)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-utils)          | Useful utility functions for Dapp developers                                                                  |
-| [web3-validator](https://github.com/ChainSafe/web3.js/tree/4.x/packages/web3-validator)           | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-validator%2Fpackage.json)](https://www.npmjs.com/package/web3-validator)           | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-validator)      | Utilities for validating objects                                                                              |
+| [web3](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3)                               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3%2Fpackage.json)](https://www.npmjs.com/package/web3)                               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3)                | :rotating_light: Entire Web3.js offering (includes all packages)                                              |
+| [web3-core](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-core)                     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-core%2Fpackage.json)](https://www.npmjs.com/package/web3-core)                     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-core)           | Core functions for web3.js packages                                                                           |
+| [web3-errors](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-errors)                 | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-errors%2Fpackage.json)](https://www.npmjs.com/package/web3-core)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-errors)         | Errors Objects                                                                                                |
+| [web3-eth](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth)                       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth%2Fpackage.json)](https://www.npmjs.com/package/web3-eth)                       | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth)            | Modules to interact with the Ethereum blockchain and smart contracts                                          |
+| [web3-eth-abi](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-abi)               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-abi%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-abi)               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-abi)        | Functions for encoding and decoding EVM in/output                                                             |
+| [web3-eth-accounts](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-accounts)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-accounts%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-accounts)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-accounts)   | Functions for managing Ethereum accounts and signing                                                          |
+| [web3-eth-contract](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-contract)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-contract%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-contract)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-contract)   | The contract package contained in [web3-eth](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth) |
+| [web3-eth-ens](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-ens)               | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-ens%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-ens)               | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-ens)        | Functions for interacting with the Ethereum Name Service                                                      |
+| [web3-eth-iban](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-iban)             | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-iban%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-iban)             | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-iban)       | Functionality for converting Ethereum addressed to IBAN addressed and vice versa                              |
+| [web3-eth-personal](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-eth-personal)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-eth-personal%2Fpackage.json)](https://www.npmjs.com/package/web3-eth-personal)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-eth-personal)   | Module to interact with the Ethereum blockchain accounts stored in the node                                   |
+| [web3-net](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-net)                       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-net%2Fpackage.json)](https://www.npmjs.com/package/web3-net)                       | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-net)            | Functions to interact with an Ethereum node's network properties                                              |
+| [web3-providers-http](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-providers-http) | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-http%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-http) | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-http) | Web3.js provider for the HTTP protocol                                                                        |
+| [web3-providers-ipc](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-providers-ipc)   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ipc%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-ipc)   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-ipc)  | Web3.js provider for IPC                                                                                      |
+| [web3-providers-ws](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-providers-ws)     | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-providers-ws%2Fpackage.json)](https://www.npmjs.com/package/web3-providers-ws)     | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-providers-ws)   | Web3.js provider for the Websocket protocol                                                                   |
+| [web3-rpc-methods](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-rpc-methods)       | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-rpc-methods%2Fpackage.json)](https://www.npmjs.com/package/web3-types)             | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/)                    | RPC Methods                                                                                                   |
+| [web3-types](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-types)                   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-types%2Fpackage.json)](https://www.npmjs.com/package/web3-types)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-types)          | Shared useable types                                                                                          |
+| [web3-utils](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-utils)                   | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-utils%2Fpackage.json)](https://www.npmjs.com/package/web3-utils)                   | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-utils)          | Useful utility functions for Dapp developers                                                                  |
+| [web3-validator](https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3-validator)           | [![npm](https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3-validator%2Fpackage.json)](https://www.npmjs.com/package/web3-validator)           | [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0) | [![documentation](https://img.shields.io/badge/typedoc-blue)](https://docs.web3js.org/api/web3-validator)      | Utilities for validating objects                                                                              |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/packages/web3
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/packages/web3
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=packages%2Fweb3%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3
+[npm-url]: https://npmjs.org/package/@etn-sc/web3
 [downloads-image]: https://img.shields.io/npm/dm/web3?label=npm%20downloads
diff --git a/packages/web3/package.json b/packages/web3/package.json
index b9f54e5a950..7bad6f9b9ff 100644
--- a/packages/web3/package.json
+++ b/packages/web3/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "web3",
+	"name": "@etn-sc/web3",
 	"version": "4.2.2",
-	"description": "Ethereum JavaScript API",
+	"description": "Electroneum SmartChain JavaScript API",
 	"main": "./lib/commonjs/index.js",
 	"module": "./lib/esm/index.js",
 	"exports": {
@@ -11,16 +11,17 @@
 			"require": "./lib/commonjs/index.js"
 		}
 	},
-	"repository": "https://github.com/ChainSafe/web3.js",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
 	"engines": {
 		"node": ">=14.0.0",
 		"npm": ">=6.12.0"
 	},
-	"author": "ChainSafe Systems",
+	"author": "Electroneum & ChainSafe Systems",
 	"browser": "./dist/web3.min.js",
 	"license": "LGPL-3.0",
 	"keywords": [
 		"Ethereum",
+		"Electroneum",
 		"JavaScript",
 		"API"
 	],
@@ -78,24 +79,24 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3-providers-ipc": "^4.0.7"
+		"@etn-sc/web3-providers-ipc": "^4.0.7"
 	},
 	"dependencies": {
-		"web3-core": "^4.3.1",
-		"web3-errors": "^1.1.4",
-		"web3-eth": "^4.3.1",
-		"web3-eth-abi": "^4.1.4",
-		"web3-eth-accounts": "^4.1.0",
-		"web3-eth-contract": "^4.1.3",
-		"web3-eth-ens": "^4.0.8",
-		"web3-eth-iban": "^4.0.7",
-		"web3-eth-personal": "^4.0.8",
-		"web3-net": "^4.0.7",
-		"web3-providers-http": "^4.1.0",
-		"web3-providers-ws": "^4.0.7",
-		"web3-rpc-methods": "^1.1.3",
-		"web3-types": "^1.3.1",
-		"web3-utils": "^4.0.7",
-		"web3-validator": "^2.0.3"
+		"@etn-sc/web3-core": "^4.3.1",
+		"@etn-sc/web3-errors": "^1.1.4",
+		"@etn-sc/web3-eth": "^4.3.1",
+		"@etn-sc/web3-eth-abi": "^4.1.4",
+		"@etn-sc/web3-eth-accounts": "^4.1.1",
+		"@etn-sc/web3-eth-contract": "^4.1.3",
+		"@etn-sc/web3-eth-ens": "^4.0.8",
+		"@etn-sc/web3-eth-iban": "^4.0.7",
+		"@etn-sc/web3-eth-personal": "^4.0.8",
+		"@etn-sc/web3-net": "^4.0.7",
+		"@etn-sc/web3-providers-http": "^4.1.0",
+		"@etn-sc/web3-providers-ws": "^4.0.7",
+		"@etn-sc/web3-rpc-methods": "^1.1.3",
+		"@etn-sc/web3-types": "^1.3.1",
+		"@etn-sc/web3-utils": "^4.0.7",
+		"@etn-sc/web3-validator": "^2.0.3"
 	}
 }
diff --git a/packages/web3/src/abi.ts b/packages/web3/src/abi.ts
index 5abe7536266..eacdec2928e 100644
--- a/packages/web3/src/abi.ts
+++ b/packages/web3/src/abi.ts
@@ -24,7 +24,7 @@ import {
 	encodeFunctionSignature,
 	encodeParameter,
 	encodeParameters,
-} from 'web3-eth-abi';
+} from '@etn-sc/web3-eth-abi';
 
 /**
  * The object for `web3.abi`
diff --git a/packages/web3/src/accounts.ts b/packages/web3/src/accounts.ts
index 0aa281bc7d0..38980b846f9 100644
--- a/packages/web3/src/accounts.ts
+++ b/packages/web3/src/accounts.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { EthExecutionAPI, Bytes, Transaction, KeyStore, ETH_DATA_FORMAT } from 'web3-types';
-import { format } from 'web3-utils';
-import { Web3Context } from 'web3-core';
-import { prepareTransactionForSigning } from 'web3-eth';
+import { EthExecutionAPI, Bytes, Transaction, KeyStore, ETH_DATA_FORMAT } from '@etn-sc/web3-types';
+import { format } from '@etn-sc/web3-utils';
+import { Web3Context } from '@etn-sc/web3-core';
+import { prepareTransactionForSigning } from '@etn-sc/web3-eth';
 import {
 	create,
 	decrypt,
@@ -31,7 +31,7 @@ import {
 	signPriorityTransaction,
 	sign,
 	Wallet,
-} from 'web3-eth-accounts';
+} from '@etn-sc/web3-eth-accounts';
 
 /**
  * Initialize the accounts module for the given context.
diff --git a/packages/web3/src/eth.exports.ts b/packages/web3/src/eth.exports.ts
index 8b37f03f77e..52cb95a643c 100644
--- a/packages/web3/src/eth.exports.ts
+++ b/packages/web3/src/eth.exports.ts
@@ -15,11 +15,11 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-export * from 'web3-eth';
+export * from '@etn-sc/web3-eth';
 
-export * as abi from 'web3-eth-abi';
-export * as accounts from 'web3-eth-accounts';
-export * as contract from 'web3-eth-contract';
-export * as ens from 'web3-eth-ens';
-export * as personal from 'web3-eth-personal';
-export * as iban from 'web3-eth-iban';
+export * as abi from '@etn-sc/web3-eth-abi';
+export * as accounts from '@etn-sc/web3-eth-accounts';
+export * as contract from '@etn-sc/web3-eth-contract';
+export * as ens from '@etn-sc/web3-eth-ens';
+export * as personal from '@etn-sc/web3-eth-personal';
+export * as iban from '@etn-sc/web3-eth-iban';
diff --git a/packages/web3/src/index.ts b/packages/web3/src/index.ts
index acffa16b057..3bac030af81 100644
--- a/packages/web3/src/index.ts
+++ b/packages/web3/src/index.ts
@@ -19,7 +19,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  * This is the main (or 'umbrella') class of the web3.js library.
  *
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  *
  * > Web3.utils
  * > Web3.version
@@ -67,7 +67,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  * The Web3 class is an umbrella package to house all Ethereum related modules.
  *
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  *
  * // "Web3.givenProvider" will be set if in an Ethereum supported browser.
  * const web3 = new Web3(Web3.givenProvider || 'ws://some.local-or-remote.node:8546');
@@ -165,7 +165,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
  *
  * #### Example
  * ```ts
- * import Web3 from 'web3';
+ * import Web3 from '@etn-sc/web3';
  * // use the given Provider or instantiate a new websocket provider
  * let web3 = new Web3(Web3.givenProvider || 'ws://remotenode.com:8546');
  * // or
@@ -331,33 +331,33 @@ export default Web3;
  * Named exports for all objects which are the default-exported-object in their packages
  */
 export { Web3 };
-export { Web3Context, Web3PluginBase, Web3EthPluginBase } from 'web3-core';
-export { Web3Eth } from 'web3-eth';
-export { Contract } from 'web3-eth-contract';
-export { Iban } from 'web3-eth-iban';
-export { Personal } from 'web3-eth-personal';
-export { Net } from 'web3-net';
-export { HttpProvider } from 'web3-providers-http';
-export { WebSocketProvider } from 'web3-providers-ws';
-export { Web3Validator } from 'web3-validator';
+export { Web3Context, Web3PluginBase, Web3EthPluginBase } from '@etn-sc/web3-core';
+export { Web3Eth } from '@etn-sc/web3-eth';
+export { Contract } from '@etn-sc/web3-eth-contract';
+export { Iban } from '@etn-sc/web3-eth-iban';
+export { Personal } from '@etn-sc/web3-eth-personal';
+export { Net } from '@etn-sc/web3-net';
+export { HttpProvider } from '@etn-sc/web3-providers-http';
+export { WebSocketProvider } from '@etn-sc/web3-providers-ws';
+export { Web3Validator } from '@etn-sc/web3-validator';
 
 /**
  * Export all packages grouped by name spaces
  */
-export * as core from 'web3-core';
-export * as errors from 'web3-errors';
+export * as core from '@etn-sc/web3-core';
+export * as errors from '@etn-sc/web3-errors';
 export * as eth from './eth.exports.js';
-export * as net from 'web3-net';
+export * as net from '@etn-sc/web3-net';
 export * as providers from './providers.exports.js';
-export * as rpcMethods from 'web3-rpc-methods';
-export * as types from 'web3-types';
-export * as utils from 'web3-utils';
-export * as validator from 'web3-validator';
+export * as rpcMethods from '@etn-sc/web3-rpc-methods';
+export * as types from '@etn-sc/web3-types';
+export * as utils from '@etn-sc/web3-utils';
+export * as validator from '@etn-sc/web3-validator';
 
 /**
  * Export all types from `web3-types` without a namespace (in addition to being available at `types` namespace).
  * To enable the user to write: `function something(): Web3Api` without the need for `types.Web3Api`.
  * And the same for `web3-errors`. Because this package contains error classes and constants.
  */
-export * from 'web3-errors';
-export * from 'web3-types';
+export * from '@etn-sc/web3-errors';
+export * from '@etn-sc/web3-types';
diff --git a/packages/web3/src/providers.exports.ts b/packages/web3/src/providers.exports.ts
index c0bbadc1b23..767f7dc0c83 100644
--- a/packages/web3/src/providers.exports.ts
+++ b/packages/web3/src/providers.exports.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-export { Eip1193Provider, SocketProvider } from 'web3-utils';
+export { Eip1193Provider, SocketProvider } from '@etn-sc/web3-utils';
 
-export * as http from 'web3-providers-http';
-export * as ws from 'web3-providers-ws';
+export * as http from '@etn-sc/web3-providers-http';
+export * as ws from '@etn-sc/web3-providers-ws';
diff --git a/packages/web3/src/types.ts b/packages/web3/src/types.ts
index fb14e6b2e1a..261ab2ac177 100644
--- a/packages/web3/src/types.ts
+++ b/packages/web3/src/types.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Bytes, Transaction } from 'web3-types';
-import Eth from 'web3-eth';
+import { Bytes, Transaction } from '@etn-sc/web3-types';
+import Eth from '@etn-sc/web3-eth';
 import {
 	decodeLog,
 	decodeParameter,
@@ -25,7 +25,7 @@ import {
 	encodeFunctionSignature,
 	encodeParameter,
 	encodeParameters,
-} from 'web3-eth-abi';
+} from '@etn-sc/web3-eth-abi';
 import {
 	encrypt,
 	hashMessage,
@@ -33,14 +33,15 @@ import {
 	recoverTransaction,
 	sign,
 	signTransaction,
+	signPriorityTransaction,
 	Wallet,
 	Web3Account,
-} from 'web3-eth-accounts';
-import { Contract } from 'web3-eth-contract';
-import { ENS } from 'web3-eth-ens';
-import { Net } from 'web3-net';
-import { Iban } from 'web3-eth-iban';
-import { Personal } from 'web3-eth-personal';
+} from '@etn-sc/web3-eth-accounts';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { ENS } from '@etn-sc/web3-eth-ens';
+import { Net } from '@etn-sc/web3-net';
+import { Iban } from '@etn-sc/web3-eth-iban';
+import { Personal } from '@etn-sc/web3-eth-personal';
 
 /**
  * The Ethereum interface for main web3 object. It provides extra methods in addition to `web3-eth` interface.
@@ -79,6 +80,11 @@ export interface Web3EthInterface extends Eth {
 			transaction: Transaction,
 			privateKey: Bytes,
 		) => ReturnType<typeof signTransaction>;
+		signPriorityTransaction: (
+			transaction: Transaction,
+			privateKey: Bytes,
+			priorityPrivateKey: Bytes,
+		) => ReturnType<typeof signPriorityTransaction>;
 		recoverTransaction: typeof recoverTransaction;
 		hashMessage: typeof hashMessage;
 		sign: typeof sign;
diff --git a/packages/web3/src/web3.ts b/packages/web3/src/web3.ts
index 2b97963121b..295fb96561c 100644
--- a/packages/web3/src/web3.ts
+++ b/packages/web3/src/web3.ts
@@ -21,23 +21,23 @@ import {
 	Web3ContextObject,
 	Web3SubscriptionConstructor,
 	isSupportedProvider,
-} from 'web3-core';
-import { Web3Eth, RegisteredSubscription, registeredSubscriptions } from 'web3-eth';
-import Contract from 'web3-eth-contract';
-import { ENS, registryAddresses } from 'web3-eth-ens';
-import { Iban } from 'web3-eth-iban';
-import { Personal } from 'web3-eth-personal';
-import { Net } from 'web3-net';
-import * as utils from 'web3-utils';
-import { isNullish } from 'web3-utils';
+} from '@etn-sc/web3-core';
+import { Web3Eth, RegisteredSubscription, registeredSubscriptions } from '@etn-sc/web3-eth';
+import Contract from '@etn-sc/web3-eth-contract';
+import { ENS, registryAddresses } from '@etn-sc/web3-eth-ens';
+import { Iban } from '@etn-sc/web3-eth-iban';
+import { Personal } from '@etn-sc/web3-eth-personal';
+import { Net } from '@etn-sc/web3-net';
+import * as utils from '@etn-sc/web3-utils';
+import { isNullish } from '@etn-sc/web3-utils';
 import {
 	Address,
 	ContractAbi,
 	ContractInitOptions,
 	EthExecutionAPI,
 	SupportedProviders,
-} from 'web3-types';
-import { InvalidMethodParamsError } from 'web3-errors';
+} from '@etn-sc/web3-types';
+import { InvalidMethodParamsError } from '@etn-sc/web3-errors';
 import abi from './abi.js';
 import { initAccountsForContext } from './accounts.js';
 import { Web3EthInterface } from './types.js';
diff --git a/packages/web3/test/cjs_black_box/package.json b/packages/web3/test/cjs_black_box/package.json
index 0ba123857f9..0c21b73e8b8 100644
--- a/packages/web3/test/cjs_black_box/package.json
+++ b/packages/web3/test/cjs_black_box/package.json
@@ -14,13 +14,13 @@
 		"test:infura:ws": "WEB3_SYSTEM_TEST_BACKEND=infura jest --forceExit"
 	},
 	"dependencies": {
-		"web3": "5.0.0"
+		"@etn-sc/web3": "5.0.0"
 	},
 	"devDependencies": {
 		"jest": "^28.1.3",
 		"ts-jest": "^28.0.7",
-		"web3-eth": "5.0.0",
-		"web3-eth-contract": "5.0.0",
-		"web3-validator": "5.0.0"
+		"@etn-sc/web3-eth": "5.0.0",
+		"@etn-sc/web3-eth-contract": "5.0.0",
+		"@etn-sc/web3-validator": "5.0.0"
 	}
 }
diff --git a/packages/web3/test/cjs_black_box/test/batchRequest.test.ts b/packages/web3/test/cjs_black_box/test/batchRequest.test.ts
index 98035c0ce43..8f6e82f25d7 100644
--- a/packages/web3/test/cjs_black_box/test/batchRequest.test.ts
+++ b/packages/web3/test/cjs_black_box/test/batchRequest.test.ts
@@ -22,7 +22,7 @@ import {
 	isWs,
 } from '../../shared_fixtures/system_tests_utils';
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const Web3 = require('web3').default;
+const Web3 = require('@etn-sc/web3').default;
 
 describe('CJS - Black Box Unit Tests - web3.BatchRequest', () => {
 	let web3: typeof Web3;
diff --git a/packages/web3/test/cjs_black_box/test/web3-eth-accounts/create.test.ts b/packages/web3/test/cjs_black_box/test/web3-eth-accounts/create.test.ts
index c5cb2f0260b..9ff21d53463 100644
--- a/packages/web3/test/cjs_black_box/test/web3-eth-accounts/create.test.ts
+++ b/packages/web3/test/cjs_black_box/test/web3-eth-accounts/create.test.ts
@@ -16,8 +16,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // TODO For some reason when running this test with a WebSocket provider
 // the test takes a long time to run afterAll
-import Web3 from 'web3';
-import { validator } from 'web3-validator';
+import Web3 from '@etn-sc/web3';
+import { validator } from '@etn-sc/web3-validator';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
diff --git a/packages/web3/test/cjs_black_box/test/web3-eth-accounts/hashMessage.test.ts b/packages/web3/test/cjs_black_box/test/web3-eth-accounts/hashMessage.test.ts
index 88959f84aa9..04a899e0c50 100644
--- a/packages/web3/test/cjs_black_box/test/web3-eth-accounts/hashMessage.test.ts
+++ b/packages/web3/test/cjs_black_box/test/web3-eth-accounts/hashMessage.test.ts
@@ -24,7 +24,7 @@ import {
 } from '../../../shared_fixtures/system_tests_utils';
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const Web3 = require('web3').default;
+const Web3 = require('@etn-sc/web3').default;
 
 jest.setTimeout(15000);
 
diff --git a/packages/web3/test/cjs_black_box/test/web3-eth-contract/erc20.test.ts b/packages/web3/test/cjs_black_box/test/web3-eth-contract/erc20.test.ts
index 87033b1ea1f..50cbaee04c8 100644
--- a/packages/web3/test/cjs_black_box/test/web3-eth-contract/erc20.test.ts
+++ b/packages/web3/test/cjs_black_box/test/web3-eth-contract/erc20.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Contract from 'web3-eth-contract';
+import Contract from '@etn-sc/web3-eth-contract';
 import {
 	closeOpenConnection,
 	describeIf,
@@ -31,7 +31,7 @@ import {
 } from '../../../shared_fixtures/contracts/ERC20Token';
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const Web3 = require('web3').default;
+const Web3 = require('@etn-sc/web3').default;
 
 describeIf(getSystemTestBackend() === 'infura')(
 	'CJS - Black Box Unit Tests - web3.eth.Contract',
diff --git a/packages/web3/test/cjs_black_box/test/web3-eth/getBlock.test.ts b/packages/web3/test/cjs_black_box/test/web3-eth/getBlock.test.ts
index 9eb415c9978..91fd4bd1cec 100644
--- a/packages/web3/test/cjs_black_box/test/web3-eth/getBlock.test.ts
+++ b/packages/web3/test/cjs_black_box/test/web3-eth/getBlock.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { validator } from 'web3-validator';
-import { blockSchema } from 'web3-eth';
+import { validator } from '@etn-sc/web3-validator';
+import { blockSchema } from '@etn-sc/web3-eth';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
@@ -24,7 +24,7 @@ import {
 } from '../../../shared_fixtures/system_tests_utils';
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const Web3 = require('web3').default;
+const Web3 = require('@etn-sc/web3').default;
 
 describe('CJS - Black Box Unit Tests - web3.eth.getBlock', () => {
 	let web3: typeof Web3;
diff --git a/packages/web3/test/cjs_black_box/test/web3-eth/getTransaction.test.ts b/packages/web3/test/cjs_black_box/test/web3-eth/getTransaction.test.ts
index b65fe6e4135..2edbd9a5b6b 100644
--- a/packages/web3/test/cjs_black_box/test/web3-eth/getTransaction.test.ts
+++ b/packages/web3/test/cjs_black_box/test/web3-eth/getTransaction.test.ts
@@ -23,7 +23,7 @@ import {
 } from '../../../shared_fixtures/system_tests_utils';
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
-const Web3 = require('web3').default;
+const Web3 = require('@etn-sc/web3').default;
 
 describe('CJS - Black Box Unit Tests - web3.eth.getTransaction', () => {
 	let web3: typeof Web3;
diff --git a/packages/web3/test/e2e/estimate_gas.test.ts b/packages/web3/test/e2e/estimate_gas.test.ts
index 872b31db6ac..3e5a6f0c3f3 100644
--- a/packages/web3/test/e2e/estimate_gas.test.ts
+++ b/packages/web3/test/e2e/estimate_gas.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { toHex } from 'web3-utils';
+import { toHex } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER, Transaction } from '../../src';
 import { getSystemE2ETestProvider, getE2ETestAccountAddress } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_balance.test.ts b/packages/web3/test/e2e/get_balance.test.ts
index f1f658faa8c..e60450628fa 100644
--- a/packages/web3/test/e2e/get_balance.test.ts
+++ b/packages/web3/test/e2e/get_balance.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isBigInt, isHexStrict, isString } from 'web3-validator';
-import { toHex } from 'web3-utils';
+import { isBigInt, isHexStrict, isString } from '@etn-sc/web3-validator';
+import { toHex } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider, getE2ETestAccountAddress } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_block.test.ts b/packages/web3/test/e2e/get_block.test.ts
index f50f73612da..6cef9d272c3 100644
--- a/packages/web3/test/e2e/get_block.test.ts
+++ b/packages/web3/test/e2e/get_block.test.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { validator } from 'web3-validator';
-import { blockSchema } from 'web3-eth';
-import { Block, Transaction } from 'web3-types';
-import { format as formatter } from 'web3-utils';
+import { validator } from '@etn-sc/web3-validator';
+import { blockSchema } from '@etn-sc/web3-eth';
+import { Block, Transaction } from '@etn-sc/web3-types';
+import { format as formatter } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_block_number.test.ts b/packages/web3/test/e2e/get_block_number.test.ts
index f2aecabca2f..c2112db77d6 100644
--- a/packages/web3/test/e2e/get_block_number.test.ts
+++ b/packages/web3/test/e2e/get_block_number.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isBigInt, isHexStrict, isNumber, isString } from 'web3-validator';
+import { isBigInt, isHexStrict, isNumber, isString } from '@etn-sc/web3-validator';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_block_transaction_count.test.ts b/packages/web3/test/e2e/get_block_transaction_count.test.ts
index 02fb0fc4357..2f75559907a 100644
--- a/packages/web3/test/e2e/get_block_transaction_count.test.ts
+++ b/packages/web3/test/e2e/get_block_transaction_count.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isBigInt, isHexStrict, isNumber, isString } from 'web3-validator';
-import { toHex } from 'web3-utils';
+import { isBigInt, isHexStrict, isNumber, isString } from '@etn-sc/web3-validator';
+import { toHex } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_chain_id.test.ts b/packages/web3/test/e2e/get_chain_id.test.ts
index 95dd93078b3..8d2e7fb054e 100644
--- a/packages/web3/test/e2e/get_chain_id.test.ts
+++ b/packages/web3/test/e2e/get_chain_id.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { toHex } from 'web3-utils';
+import { toHex } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_fee_history.test.ts b/packages/web3/test/e2e/get_fee_history.test.ts
index 9097b310e90..dd999a120bd 100644
--- a/packages/web3/test/e2e/get_fee_history.test.ts
+++ b/packages/web3/test/e2e/get_fee_history.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { feeHistorySchema } from 'web3-eth';
+import { feeHistorySchema } from '@etn-sc/web3-eth';
 
 import Web3, { FMT_BYTES, FMT_NUMBER, Numbers } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_gas_price.test.ts b/packages/web3/test/e2e/get_gas_price.test.ts
index 8bbb9e856ff..83c84d1b0dc 100644
--- a/packages/web3/test/e2e/get_gas_price.test.ts
+++ b/packages/web3/test/e2e/get_gas_price.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isBigInt, isHexStrict, isNumber, isString } from 'web3-validator';
+import { isBigInt, isHexStrict, isNumber, isString } from '@etn-sc/web3-validator';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_protocol_version.test.ts b/packages/web3/test/e2e/get_protocol_version.test.ts
index 49da2e4550b..f2cbd1c37de 100644
--- a/packages/web3/test/e2e/get_protocol_version.test.ts
+++ b/packages/web3/test/e2e/get_protocol_version.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isHexStrict } from 'web3-validator';
+import { isHexStrict } from '@etn-sc/web3-validator';
 
 import Web3 from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_transaction_from_block.test.ts b/packages/web3/test/e2e/get_transaction_from_block.test.ts
index 3c7b18eccd7..c33d318a9c5 100644
--- a/packages/web3/test/e2e/get_transaction_from_block.test.ts
+++ b/packages/web3/test/e2e/get_transaction_from_block.test.ts
@@ -16,7 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable jest/no-conditional-expect */
 
-import { Numbers, TransactionInfo } from 'web3-types';
+import { Numbers, TransactionInfo } from '@etn-sc/web3-types';
 
 import Web3 from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/get_uncle.test.ts b/packages/web3/test/e2e/get_uncle.test.ts
index 75da6e73937..e32cf449896 100644
--- a/packages/web3/test/e2e/get_uncle.test.ts
+++ b/packages/web3/test/e2e/get_uncle.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Numbers } from 'web3-types';
+import { Numbers } from '@etn-sc/web3-types';
 
 import Web3 from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
diff --git a/packages/web3/test/e2e/mainnet/call.test.ts b/packages/web3/test/e2e/mainnet/call.test.ts
index 45778deb761..7c91e5e7c73 100644
--- a/packages/web3/test/e2e/mainnet/call.test.ts
+++ b/packages/web3/test/e2e/mainnet/call.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { bytesToHex } from 'web3-utils';
+import { bytesToHex } from '@etn-sc/web3-utils';
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3/test/e2e/mainnet/get_code.test.ts b/packages/web3/test/e2e/mainnet/get_code.test.ts
index 0bcb6026510..a16aea9a9de 100644
--- a/packages/web3/test/e2e/mainnet/get_code.test.ts
+++ b/packages/web3/test/e2e/mainnet/get_code.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../../src';
 import {
diff --git a/packages/web3/test/e2e/mainnet/get_past_logs.test.ts b/packages/web3/test/e2e/mainnet/get_past_logs.test.ts
index 33fdaef06ee..9b93e45a1f5 100644
--- a/packages/web3/test/e2e/mainnet/get_past_logs.test.ts
+++ b/packages/web3/test/e2e/mainnet/get_past_logs.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-import { hexToBytes, numberToHex, hexToNumber } from 'web3-utils';
-import { Log } from 'web3-types';
+import { hexToBytes, numberToHex, hexToNumber } from '@etn-sc/web3-utils';
+import { Log } from '@etn-sc/web3-types';
 import Web3, { FMT_BYTES, FMT_NUMBER, LogAPI } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3/test/e2e/mainnet/get_transaction.test.ts b/packages/web3/test/e2e/mainnet/get_transaction.test.ts
index 294ddb00219..270850548a6 100644
--- a/packages/web3/test/e2e/mainnet/get_transaction.test.ts
+++ b/packages/web3/test/e2e/mainnet/get_transaction.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, TransactionInfo } from 'web3-types';
-import { bytesToUint8Array, hexToBytes } from 'web3-utils';
+import { Bytes, TransactionInfo } from '@etn-sc/web3-types';
+import { bytesToUint8Array, hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3 from '../../../src';
 import { getSystemE2ETestProvider } from '../e2e_utils';
diff --git a/packages/web3/test/e2e/mainnet/get_transaction_receipt.test.ts b/packages/web3/test/e2e/mainnet/get_transaction_receipt.test.ts
index 7c1ad00fcbb..c6c6d6d42be 100644
--- a/packages/web3/test/e2e/mainnet/get_transaction_receipt.test.ts
+++ b/packages/web3/test/e2e/mainnet/get_transaction_receipt.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes } from 'web3-types';
-import { bytesToUint8Array, hexToBytes } from 'web3-utils';
+import { Bytes } from '@etn-sc/web3-types';
+import { bytesToUint8Array, hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3 from '../../../src';
 import { getSystemE2ETestProvider, getE2ETestContractAddress } from '../e2e_utils';
diff --git a/packages/web3/test/e2e/sepolia/call.test.ts b/packages/web3/test/e2e/sepolia/call.test.ts
index 33a3f7db398..51100f2af99 100644
--- a/packages/web3/test/e2e/sepolia/call.test.ts
+++ b/packages/web3/test/e2e/sepolia/call.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../../src';
 import {
diff --git a/packages/web3/test/e2e/sepolia/get_code.test.ts b/packages/web3/test/e2e/sepolia/get_code.test.ts
index 43373feb180..71d6761898e 100644
--- a/packages/web3/test/e2e/sepolia/get_code.test.ts
+++ b/packages/web3/test/e2e/sepolia/get_code.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { hexToBytes } from 'web3-utils';
+import { hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3, { FMT_BYTES, FMT_NUMBER } from '../../../src';
 import {
diff --git a/packages/web3/test/e2e/sepolia/get_past_logs.test.ts b/packages/web3/test/e2e/sepolia/get_past_logs.test.ts
index b7ada0c6d09..cc6612b2fe8 100644
--- a/packages/web3/test/e2e/sepolia/get_past_logs.test.ts
+++ b/packages/web3/test/e2e/sepolia/get_past_logs.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-import { hexToBytes, numberToHex, hexToNumber } from 'web3-utils';
-import { Log } from 'web3-types';
+import { hexToBytes, numberToHex, hexToNumber } from '@etn-sc/web3-utils';
+import { Log } from '@etn-sc/web3-types';
 import Web3, { FMT_BYTES, FMT_NUMBER, LogAPI } from '../../../src';
 import {
 	closeOpenConnection,
diff --git a/packages/web3/test/e2e/sepolia/get_transaction.test.ts b/packages/web3/test/e2e/sepolia/get_transaction.test.ts
index 4c52583919d..df0ea503d1b 100644
--- a/packages/web3/test/e2e/sepolia/get_transaction.test.ts
+++ b/packages/web3/test/e2e/sepolia/get_transaction.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes, TransactionInfo } from 'web3-types';
-import { bytesToUint8Array, hexToBytes } from 'web3-utils';
+import { Bytes, TransactionInfo } from '@etn-sc/web3-types';
+import { bytesToUint8Array, hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3 from '../../../src';
 import { getSystemE2ETestProvider } from '../e2e_utils';
diff --git a/packages/web3/test/e2e/sepolia/get_transaction_receipt.test.ts b/packages/web3/test/e2e/sepolia/get_transaction_receipt.test.ts
index 063be95cb21..5deeb8d3f28 100644
--- a/packages/web3/test/e2e/sepolia/get_transaction_receipt.test.ts
+++ b/packages/web3/test/e2e/sepolia/get_transaction_receipt.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Bytes } from 'web3-types';
-import { bytesToUint8Array, hexToBytes } from 'web3-utils';
+import { Bytes } from '@etn-sc/web3-types';
+import { bytesToUint8Array, hexToBytes } from '@etn-sc/web3-utils';
 
 import Web3 from '../../../src';
 import { getSystemE2ETestProvider, getE2ETestContractAddress } from '../e2e_utils';
diff --git a/packages/web3/test/e2e/web3_extend.test.ts b/packages/web3/test/e2e/web3_extend.test.ts
index 36e52b0c35c..5e0ddc35535 100644
--- a/packages/web3/test/e2e/web3_extend.test.ts
+++ b/packages/web3/test/e2e/web3_extend.test.ts
@@ -14,13 +14,13 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { isNumber } from 'web3-validator';
+import { isNumber } from '@etn-sc/web3-validator';
 
 import Web3 from '../../src';
 import { getSystemE2ETestProvider } from './e2e_utils';
 import { closeOpenConnection, getSystemTestBackend } from '../shared_fixtures/system_tests_utils';
 
-declare module 'web3' {
+declare module '@etn-sc/web3' {
 	interface Web3Context {
 		L2Module: {
 			getL2BlockInfo(): Promise<bigint>;
diff --git a/packages/web3/test/esm_black_box/package.json b/packages/web3/test/esm_black_box/package.json
index 67c4cb696f5..3472966eb7f 100644
--- a/packages/web3/test/esm_black_box/package.json
+++ b/packages/web3/test/esm_black_box/package.json
@@ -14,13 +14,13 @@
 		"test:infura:ws": "WEB3_SYSTEM_TEST_BACKEND=infura jest --forceExit"
 	},
 	"dependencies": {
-		"web3": "5.0.0"
+		"@etn-sc/web3": "5.0.0"
 	},
 	"devDependencies": {
 		"jest": "^28.1.3",
 		"ts-jest": "^28.0.7",
-		"web3-eth": "5.0.0",
-		"web3-eth-contract": "5.0.0",
-		"web3-validator": "5.0.0"
+		"@etn-sc/web3-eth": "5.0.0",
+		"@etn-sc/web3-eth-contract": "5.0.0",
+		"@etn-sc/web3-validator": "5.0.0"
 	}
 }
diff --git a/packages/web3/test/esm_black_box/test/batchRequest.test.ts b/packages/web3/test/esm_black_box/test/batchRequest.test.ts
index 857a55410a5..5b69da5c6c1 100644
--- a/packages/web3/test/esm_black_box/test/batchRequest.test.ts
+++ b/packages/web3/test/esm_black_box/test/batchRequest.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable import/no-relative-packages */
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 
 import {
 	closeOpenConnection,
diff --git a/packages/web3/test/esm_black_box/test/web3-eth-accounts/create.test.ts b/packages/web3/test/esm_black_box/test/web3-eth-accounts/create.test.ts
index c5cb2f0260b..9ff21d53463 100644
--- a/packages/web3/test/esm_black_box/test/web3-eth-accounts/create.test.ts
+++ b/packages/web3/test/esm_black_box/test/web3-eth-accounts/create.test.ts
@@ -16,8 +16,8 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // TODO For some reason when running this test with a WebSocket provider
 // the test takes a long time to run afterAll
-import Web3 from 'web3';
-import { validator } from 'web3-validator';
+import Web3 from '@etn-sc/web3';
+import { validator } from '@etn-sc/web3-validator';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
diff --git a/packages/web3/test/esm_black_box/test/web3-eth-accounts/hashMessage.test.ts b/packages/web3/test/esm_black_box/test/web3-eth-accounts/hashMessage.test.ts
index b1f0eb087de..71941d0f0d0 100644
--- a/packages/web3/test/esm_black_box/test/web3-eth-accounts/hashMessage.test.ts
+++ b/packages/web3/test/esm_black_box/test/web3-eth-accounts/hashMessage.test.ts
@@ -16,7 +16,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 // TODO For some reason when running this test with a WebSocket provider
 // the test takes a long time to run afterAll
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
diff --git a/packages/web3/test/esm_black_box/test/web3-eth-contract/erc20.test.ts b/packages/web3/test/esm_black_box/test/web3-eth-contract/erc20.test.ts
index 2139e4becba..d1380ec6df6 100644
--- a/packages/web3/test/esm_black_box/test/web3-eth-contract/erc20.test.ts
+++ b/packages/web3/test/esm_black_box/test/web3-eth-contract/erc20.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 /* eslint-disable import/no-relative-packages */
-import Web3 from 'web3';
-import Contract from 'web3-eth-contract';
+import Web3 from '@etn-sc/web3';
+import Contract from '@etn-sc/web3-eth-contract';
 
 import {
 	closeOpenConnection,
diff --git a/packages/web3/test/esm_black_box/test/web3-eth/getBlock.test.ts b/packages/web3/test/esm_black_box/test/web3-eth/getBlock.test.ts
index 9b383028cfb..64e8f872668 100644
--- a/packages/web3/test/esm_black_box/test/web3-eth/getBlock.test.ts
+++ b/packages/web3/test/esm_black_box/test/web3-eth/getBlock.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
-import { validator } from 'web3-validator';
-import { blockSchema } from 'web3-eth';
+import Web3 from '@etn-sc/web3';
+import { validator } from '@etn-sc/web3-validator';
+import { blockSchema } from '@etn-sc/web3-eth';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
diff --git a/packages/web3/test/esm_black_box/test/web3-eth/getTransaction.test.ts b/packages/web3/test/esm_black_box/test/web3-eth/getTransaction.test.ts
index 385af52226f..6784bdb5689 100644
--- a/packages/web3/test/esm_black_box/test/web3-eth/getTransaction.test.ts
+++ b/packages/web3/test/esm_black_box/test/web3-eth/getTransaction.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 import {
 	closeOpenConnection,
 	getSystemTestProvider,
diff --git a/packages/web3/test/fixtures/tx-type-15/index.ts b/packages/web3/test/fixtures/tx-type-15/index.ts
index 8dd34b35e25..ee4a566cf8b 100644
--- a/packages/web3/test/fixtures/tx-type-15/index.ts
+++ b/packages/web3/test/fixtures/tx-type-15/index.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { keccak256 } from 'ethereum-cryptography/keccak';
-import { validateNoLeadingZeroes } from 'web3-validator';
+import { validateNoLeadingZeroes } from '@etn-sc/web3-validator';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { RLP } from '@ethereumjs/rlp';
-import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from 'web3-utils';
+import { bytesToHex, hexToBytes, uint8ArrayConcat, uint8ArrayEquals } from '@etn-sc/web3-utils';
 import {
 	BaseTransaction,
 	FeeMarketEIP1559Transaction,
@@ -35,7 +35,7 @@ import {
 	FeeMarketEIP1559ValuesArray,
 	JsonTx,
 	TxOptions,
-} from 'web3-eth-accounts';
+} from '@etn-sc/web3-eth-accounts';
 
 const { getAccessListData, getAccessListJSON, getDataFeeEIP2930, verifyAccessList } = txUtils;
 
diff --git a/packages/web3/test/integration/external-providers/helper.ts b/packages/web3/test/integration/external-providers/helper.ts
index c1f88dd86b0..8505f04b78e 100644
--- a/packages/web3/test/integration/external-providers/helper.ts
+++ b/packages/web3/test/integration/external-providers/helper.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { SupportedProviders } from 'web3-types';
+import { SupportedProviders } from '@etn-sc/web3-types';
 import Web3 from '../../../src/index';
 
 /**
diff --git a/packages/web3/test/integration/external-providers/in3.test.ts b/packages/web3/test/integration/external-providers/in3.test.ts
index 72fe0d72be3..7393f68a239 100644
--- a/packages/web3/test/integration/external-providers/in3.test.ts
+++ b/packages/web3/test/integration/external-providers/in3.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { waitWithTimeout, setRequestIdStart } from 'web3-utils';
+import { waitWithTimeout, setRequestIdStart } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import In3Client from 'in3';
 
diff --git a/packages/web3/test/integration/handle_revert.test.ts b/packages/web3/test/integration/handle_revert.test.ts
index 89304c1414e..3f621915f7f 100644
--- a/packages/web3/test/integration/handle_revert.test.ts
+++ b/packages/web3/test/integration/handle_revert.test.ts
@@ -14,9 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { TransactionRevertInstructionError } from 'web3-errors';
-import { Contract } from 'web3-eth-contract';
-import WebSocketProvider from 'web3-providers-ws';
+import { TransactionRevertInstructionError } from '@etn-sc/web3-errors';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
 import Web3 from '../../src/index';
 import { BasicAbi, BasicBytecode } from '../shared_fixtures/build/Basic';
 import {
diff --git a/packages/web3/test/integration/ipc.test.ts b/packages/web3/test/integration/ipc.test.ts
index e22c3cc3d04..32eb4885c6d 100644
--- a/packages/web3/test/integration/ipc.test.ts
+++ b/packages/web3/test/integration/ipc.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import {
 	getSystemTestProvider,
 	describeIf,
diff --git a/packages/web3/test/integration/web3-plugin-add-tx.test.ts b/packages/web3/test/integration/web3-plugin-add-tx.test.ts
index d1971b7f4ef..f620ce1f565 100644
--- a/packages/web3/test/integration/web3-plugin-add-tx.test.ts
+++ b/packages/web3/test/integration/web3-plugin-add-tx.test.ts
@@ -17,7 +17,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 
-import { Transaction, TransactionFactory, Web3Account } from 'web3-eth-accounts';
+import { Transaction, TransactionFactory, Web3Account } from '@etn-sc/web3-eth-accounts';
 import { SupportedProviders, Web3, Web3PluginBase } from '../../src';
 import {
 	createAccount,
diff --git a/packages/web3/test/integration/web3.accounts.test.ts b/packages/web3/test/integration/web3.accounts.test.ts
index 22a0c83a8c1..f7d0e4951a0 100644
--- a/packages/web3/test/integration/web3.accounts.test.ts
+++ b/packages/web3/test/integration/web3.accounts.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Account } from 'web3-eth-accounts';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import {
 	getSystemTestProvider,
 	createNewAccount,
diff --git a/packages/web3/test/integration/web3.eth.transaction.test.ts b/packages/web3/test/integration/web3.eth.transaction.test.ts
index 3a33984a9e9..45e6a5652e7 100644
--- a/packages/web3/test/integration/web3.eth.transaction.test.ts
+++ b/packages/web3/test/integration/web3.eth.transaction.test.ts
@@ -15,12 +15,12 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import * as httpProvider from 'web3-providers-http';
-import { Web3Account } from 'web3-eth-accounts';
+import * as httpProvider from '@etn-sc/web3-providers-http';
+import { Web3Account } from '@etn-sc/web3-eth-accounts';
 import Web3, { DEFAULT_RETURN_FORMAT, Transaction } from '../../src';
 import testsData from '../fixtures/transactions.json';
 
-jest.mock('web3-providers-http');
+jest.mock('@etn-sc/web3-providers-http');
 
 describe('signTransaction', () => {
 	let blockNum = 1;
diff --git a/packages/web3/test/integration/web3.test.ts b/packages/web3/test/integration/web3.test.ts
index 18a49dd0fcc..7c1354bc05c 100644
--- a/packages/web3/test/integration/web3.test.ts
+++ b/packages/web3/test/integration/web3.test.ts
@@ -15,11 +15,11 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import Contract from 'web3-eth-contract';
-import HttpProvider from 'web3-providers-http';
-import { IpcProvider } from 'web3-providers-ipc';
-import WebSocketProvider from 'web3-providers-ws';
-import { JsonRpcOptionalRequest, SupportedProviders, Web3BaseProvider } from 'web3-types';
+import Contract from '@etn-sc/web3-eth-contract';
+import HttpProvider from '@etn-sc/web3-providers-http';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
+import WebSocketProvider from '@etn-sc/web3-providers-ws';
+import { JsonRpcOptionalRequest, SupportedProviders, Web3BaseProvider } from '@etn-sc/web3-types';
 import { Web3 } from '../../src/index';
 import { BasicAbi } from '../shared_fixtures/Basic';
 import { GreeterAbi } from '../shared_fixtures/build/Greeter';
diff --git a/packages/web3/test/shared_fixtures/data.ts b/packages/web3/test/shared_fixtures/data.ts
index 20f19bd5e80..1a6f263960c 100644
--- a/packages/web3/test/shared_fixtures/data.ts
+++ b/packages/web3/test/shared_fixtures/data.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { encodeParameters } from 'web3-eth-abi';
+import { encodeParameters } from '@etn-sc/web3-eth-abi';
 
 export const validEncodeParametersData: {
 	input: Parameters<typeof encodeParameters>;
diff --git a/packages/web3/test/unit/accounts.test.ts b/packages/web3/test/unit/accounts.test.ts
index 9cc2618d24b..8c625aeab6a 100644
--- a/packages/web3/test/unit/accounts.test.ts
+++ b/packages/web3/test/unit/accounts.test.ts
@@ -15,14 +15,14 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import * as eth from 'web3-eth';
-import * as ethAccounts from 'web3-eth-accounts';
-import { SignTransactionResult, Web3Account } from 'web3-eth-accounts';
+import * as eth from '@etn-sc/web3-eth';
+import * as ethAccounts from '@etn-sc/web3-eth-accounts';
+import { SignTransactionResult, Web3Account } from '@etn-sc/web3-eth-accounts';
 import { Web3EthInterface } from '../../src/types';
 import { Web3 } from '../../src';
 
-jest.mock('web3-eth-accounts');
-jest.mock('web3-eth');
+jest.mock('@etn-sc/web3-eth-accounts');
+jest.mock('@etn-sc/web3-eth');
 
 describe('test new Web3().eth.accounts', () => {
 	let accounts: Web3EthInterface['accounts'];
diff --git a/packages/web3/test/unit/index.test.ts b/packages/web3/test/unit/index.test.ts
index be402a68166..fc8fbed853d 100644
--- a/packages/web3/test/unit/index.test.ts
+++ b/packages/web3/test/unit/index.test.ts
@@ -15,17 +15,17 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Eth } from 'web3-eth';
+import { Web3Eth } from '@etn-sc/web3-eth';
 
-import * as abi from 'web3-eth-abi';
-import * as accounts from 'web3-eth-accounts';
-import * as contract from 'web3-eth-contract';
-import * as ens from 'web3-eth-ens';
-import * as personal from 'web3-eth-personal';
-import * as iban from 'web3-eth-iban';
+import * as abi from '@etn-sc/web3-eth-abi';
+import * as accounts from '@etn-sc/web3-eth-accounts';
+import * as contract from '@etn-sc/web3-eth-contract';
+import * as ens from '@etn-sc/web3-eth-ens';
+import * as personal from '@etn-sc/web3-eth-personal';
+import * as iban from '@etn-sc/web3-eth-iban';
 
-import * as http from 'web3-providers-http';
-import * as ws from 'web3-providers-ws';
+import * as http from '@etn-sc/web3-providers-http';
+import * as ws from '@etn-sc/web3-providers-ws';
 
 import Web3Default, { Web3, providers, eth } from '../../src/index';
 
diff --git a/packages/web3/test/unit/web3-custom-subscriptions.test.ts b/packages/web3/test/unit/web3-custom-subscriptions.test.ts
index 9da93f35504..f248399f4f5 100644
--- a/packages/web3/test/unit/web3-custom-subscriptions.test.ts
+++ b/packages/web3/test/unit/web3-custom-subscriptions.test.ts
@@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Web3Subscription, Web3SubscriptionManager } from 'web3-core';
+import { Web3Subscription, Web3SubscriptionManager } from '@etn-sc/web3-core';
 import { Web3 } from '../../src/web3';
 
 class CustomSubscription extends Web3Subscription<
diff --git a/packages/web3/test/unit/web3.extend.test.ts b/packages/web3/test/unit/web3.extend.test.ts
index 4847cf0d898..cae04872a62 100644
--- a/packages/web3/test/unit/web3.extend.test.ts
+++ b/packages/web3/test/unit/web3.extend.test.ts
@@ -15,10 +15,10 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Address, BlockTag } from 'web3-types';
+import { Address, BlockTag } from '@etn-sc/web3-types';
 import { Web3 } from '../../src/web3';
 
-declare module 'web3' {
+declare module '@etn-sc/web3' {
 	interface Web3Context {
 		// for first test like web3.myModule.getL2Balance(...)
 		myModule: {
diff --git a/packages/web3/test/unit/web3.test.ts b/packages/web3/test/unit/web3.test.ts
index 3d520f38e36..7b9bbc421f2 100644
--- a/packages/web3/test/unit/web3.test.ts
+++ b/packages/web3/test/unit/web3.test.ts
@@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import { Contract } from 'web3-eth-contract';
-import { ContractInitOptions } from 'web3-types';
+import { Contract } from '@etn-sc/web3-eth-contract';
+import { ContractInitOptions } from '@etn-sc/web3-types';
 import { Web3 } from '../../src/web3';
 
 describe('Web3 object', () => {
diff --git a/scripts/gen_accounts.js b/scripts/gen_accounts.js
index b67519a702e..6c0288e9081 100644
--- a/scripts/gen_accounts.js
+++ b/scripts/gen_accounts.js
@@ -1,5 +1,5 @@
-const { Personal } = require('web3-eth-personal');
-const { Web3Eth } = require('web3-eth');
+const { Personal } = require('@etn-sc/web3-eth-personal');
+const { Web3Eth } = require('@etn-sc/web3-eth');
 const tempAccountList = require('./accounts.json');
 
 const getEnvVar = name => (global.Cypress ? Cypress.env(name) : process.env[name]);
diff --git a/scripts/system_tests_utils.ts b/scripts/system_tests_utils.ts
index 1c29d058060..ef2be1c7e2f 100644
--- a/scripts/system_tests_utils.ts
+++ b/scripts/system_tests_utils.ts
@@ -16,19 +16,19 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { format, SocketProvider } from 'web3-utils';
+import { format, SocketProvider } from '@etn-sc/web3-utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import {
 	create as _createAccount,
 	decrypt,
 	privateKeyToAccount,
 	signTransaction,
-} from 'web3-eth-accounts';
+} from '@etn-sc/web3-eth-accounts';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { prepareTransactionForSigning, Web3Eth } from 'web3-eth';
+import { prepareTransactionForSigning, Web3Eth } from '@etn-sc/web3-eth';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import {
@@ -46,18 +46,18 @@ import {
 	SupportedProviders,
 	Web3APISpec,
 	Web3EthExecutionAPI,
-} from 'web3-types';
+} from '@etn-sc/web3-types';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { Personal } from 'web3-eth-personal';
+import { Personal } from '@etn-sc/web3-eth-personal';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { NonPayableMethodObject } from 'web3-eth-contract';
+import { NonPayableMethodObject } from '@etn-sc/web3-eth-contract';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import HttpProvider from 'web3-providers-http';
+import HttpProvider from '@etn-sc/web3-providers-http';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { IpcProvider } from 'web3-providers-ipc';
+import { IpcProvider } from '@etn-sc/web3-providers-ipc';
 import accountsString from './accounts.json';
 
 /**
diff --git a/tools/web3-packagetemplate/README.md b/tools/web3-packagetemplate/README.md
index 4fe1e0036b6..3ddd65aaee6 100644
--- a/tools/web3-packagetemplate/README.md
+++ b/tools/web3-packagetemplate/README.md
@@ -9,30 +9,23 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is a sub-package of [web3.js][repo].
+This is a sub-package of [@etn-sc/web3.js][repo].
 
-`web3-packagetemplate` contains the ideal setup for a Web3.js package.
+`@etn-sc/web3-packagetemplate` contains the ideal setup for a Web3.js package.
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-packagetemplate) or using [Yarn](https://yarnpkg.com/package/web3-packagetemplate)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-packagetemplate)
 
 ### Using NPM
 
 ```bash
-npm install web3-packagetemplate
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-packagetemplate
+npm install @etn-sc/web3-packagetemplate
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -53,7 +46,7 @@ yarn add web3-packagetemplate
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/tools/web3-packagetemplate
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/tools/web3-packagetemplate
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=tools%2Fweb3-packagetemplate%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-packagetemplate
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-packagetemplate
 [downloads-image]: https://img.shields.io/npm/dm/web3-packagetemplate?label=npm%20downloads
diff --git a/tools/web3-packagetemplate/package.json b/tools/web3-packagetemplate/package.json
index c9181be53a0..a7e1b829efe 100644
--- a/tools/web3-packagetemplate/package.json
+++ b/tools/web3-packagetemplate/package.json
@@ -1,10 +1,10 @@
 {
-	"name": "web3-packagetemplate",
+	"name": "@etn-sc/web3-packagetemplate",
 	"version": "1.1.1",
 	"description": "Package template for Web3 4.x.x",
 	"main": "lib/index.js",
-	"repository": "https://github.com/ChainSafe/web3.js",
-	"author": "ChainSafe Systems",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"engines": {
 		"node": ">=14",
diff --git a/tools/web3-plugin-example/README.md b/tools/web3-plugin-example/README.md
index f06e2d7d065..369fb1382b4 100644
--- a/tools/web3-plugin-example/README.md
+++ b/tools/web3-plugin-example/README.md
@@ -9,28 +9,21 @@
 [![NPM Package][npm-image]][npm-url]
 [![Downloads][downloads-image]][npm-url]
 
-This is an example of a plugin implementation for [web3.js][repo].
+This is an example of a plugin implementation for [@etn-sc/web3.js][repo].
 
 ## Installation
 
-You can install the package either using [NPM](https://www.npmjs.com/package/web3-plugin-example) or using [Yarn](https://yarnpkg.com/package/web3-plugin-example)
+You can install the package using [NPM](https://www.npmjs.com/package/@etn-sc/web3-plugin-example)
 
 ### Using NPM
 
 ```bash
-npm install web3-plugin-example
-```
-
-### Using Yarn
-
-```bash
-yarn add web3-plugin-example
+npm install @etn-sc/web3-plugin-example
 ```
 
 ## Getting Started
 
--   :writing_hand: If you have questions [submit an issue](https://github.com/ChainSafe/web3.js/issues/new) or join us on [Discord](https://discord.gg/yjyvFRP)
-    ![Discord](https://img.shields.io/discord/593655374469660673.svg?label=Discord&logo=discord)
+-   :writing_hand: If you have questions [submit an issue](https://github.com/electroneum/electroneum-web3.js/issues/new)
 
 ## Prerequisites
 
@@ -51,7 +44,7 @@ yarn add web3-plugin-example
 | test:unit        | Uses `jest` to run tests under `/test/unit`        |
 
 [docs]: https://docs.web3js.org/
-[repo]: https://github.com/web3/web3.js/tree/4.x/tools/web3-plugin-example
+[repo]: https://github.com/electroneum/electroneum-web3.js/tree/4.x/tools/web3-plugin-example
 [npm-image]: https://img.shields.io/github/package-json/v/web3/web3.js/4.x?filename=tools%2Fweb3-plugin-example%2Fpackage.json
-[npm-url]: https://npmjs.org/package/web3-plugin-example
+[npm-url]: https://npmjs.org/package/@etn-sc/web3-plugin-example
 [downloads-image]: https://img.shields.io/npm/dm/web3-plugin-example?label=npm%20downloads
diff --git a/tools/web3-plugin-example/package.json b/tools/web3-plugin-example/package.json
index 6e5782e9f3d..7bda88571f0 100644
--- a/tools/web3-plugin-example/package.json
+++ b/tools/web3-plugin-example/package.json
@@ -1,16 +1,17 @@
 {
-	"name": "web3-plugin-example",
+	"name": "@etn-sc/web3-plugin-example",
 	"version": "1.0.6",
 	"description": "Example implementations of Web3.js' 4.x plugin system",
-	"repository": "https://github.com/ChainSafe/web3.js",
+	"repository": "https://github.com/electroneum/electroneum-web3.js",
 	"engines": {
 		"node": ">=14",
 		"npm": ">=6.12.0"
 	},
-	"author": "ChainSafe Systems",
+	"author": "Electroneum & ChainSafe Systems",
 	"license": "LGPL-3.0",
 	"keywords": [
 		"Ethereum",
+		"Electroneum",
 		"JavaScript",
 		"API"
 	],
@@ -45,18 +46,18 @@
 		"prettier": "^2.7.1",
 		"ts-jest": "^28.0.7",
 		"typescript": "^4.7.4",
-		"web3": "^4.2.1",
-		"web3-core": "^4.3.0",
-		"web3-eth-abi": "^4.1.4",
-		"web3-eth-contract": "^4.1.2",
-		"web3-types": "^1.3.0",
-		"web3-utils": "^4.0.7"
+		"@etn-sc/web3": "^4.2.1",
+		"@etn-sc/web3-core": "^4.3.0",
+		"@etn-sc/web3-eth-abi": "^4.1.4",
+		"@etn-sc/web3-eth-contract": "^4.1.2",
+		"@etn-sc/web3-types": "^1.3.0",
+		"@etn-sc/web3-utils": "^4.0.7"
 	},
 	"peerDependencies": {
-		"web3-core": ">= 4.1.1 < 5",
-		"web3-eth-abi": ">= 4.1.1 < 5",
-		"web3-eth-contract": ">= 4.0.5 < 5",
-		"web3-types": ">= 1.1.1 < 5",
-		"web3-utils": ">= 4.0.5 < 5"
+		"@etn-sc/web3-core": ">= 4.1.1 < 5",
+		"@etn-sc/web3-eth-abi": ">= 4.1.1 < 5",
+		"@etn-sc/web3-eth-contract": ">= 4.0.5 < 5",
+		"@etn-sc/web3-types": ">= 1.1.1 < 5",
+		"@etn-sc/web3-utils": ">= 4.0.5 < 5"
 	}
 }
diff --git a/tools/web3-plugin-example/src/contract_method_wrappers.ts b/tools/web3-plugin-example/src/contract_method_wrappers.ts
index c9b90a112fd..dffaa680585 100644
--- a/tools/web3-plugin-example/src/contract_method_wrappers.ts
+++ b/tools/web3-plugin-example/src/contract_method_wrappers.ts
@@ -14,10 +14,10 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3PluginBase } from 'web3-core';
-import Contract from 'web3-eth-contract';
-import { Address, ContractAbi, DataFormat, DEFAULT_RETURN_FORMAT, Numbers } from 'web3-types';
-import { format, numberToHex } from 'web3-utils';
+import { Web3PluginBase } from '@etn-sc/web3-core';
+import Contract from '@etn-sc/web3-eth-contract';
+import { Address, ContractAbi, DataFormat, DEFAULT_RETURN_FORMAT, Numbers } from '@etn-sc/web3-types';
+import { format, numberToHex } from '@etn-sc/web3-utils';
 // eslint-disable-next-line require-extensions/require-extensions
 import { ERC20TokenAbi } from './ERC20Token';
 // eslint-disable-next-line require-extensions/require-extensions
diff --git a/tools/web3-plugin-example/src/custom_rpc_methods.ts b/tools/web3-plugin-example/src/custom_rpc_methods.ts
index 101816a9c27..047e782e196 100644
--- a/tools/web3-plugin-example/src/custom_rpc_methods.ts
+++ b/tools/web3-plugin-example/src/custom_rpc_methods.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3PluginBase } from 'web3-core';
+import { Web3PluginBase } from '@etn-sc/web3-core';
 // eslint-disable-next-line require-extensions/require-extensions
 import { Web3Context } from './reexported_web3_context';
 
diff --git a/tools/web3-plugin-example/src/reexported_web3_context.ts b/tools/web3-plugin-example/src/reexported_web3_context.ts
index c9d87dafcb4..6a4537a9435 100644
--- a/tools/web3-plugin-example/src/reexported_web3_context.ts
+++ b/tools/web3-plugin-example/src/reexported_web3_context.ts
@@ -14,6 +14,6 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 
 export { Web3Context };
diff --git a/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts b/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts
index 0f79df21e49..b527459dd75 100644
--- a/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts
+++ b/tools/web3-plugin-example/test/unit/contract_method_wrappers.test.ts
@@ -14,8 +14,8 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
-import { DEFAULT_RETURN_FORMAT } from 'web3-types';
+import Web3 from '@etn-sc/web3';
+import { DEFAULT_RETURN_FORMAT } from '@etn-sc/web3-types';
 
 import { ContractMethodWrappersPlugin } from '../../src/contract_method_wrappers';
 import { ERC20TokenAbi } from '../../src/ERC20Token';
diff --git a/tools/web3-plugin-example/test/unit/custom_rpc_methods.test.ts b/tools/web3-plugin-example/test/unit/custom_rpc_methods.test.ts
index b65a23dad70..ae31ef9a5d2 100644
--- a/tools/web3-plugin-example/test/unit/custom_rpc_methods.test.ts
+++ b/tools/web3-plugin-example/test/unit/custom_rpc_methods.test.ts
@@ -14,7 +14,7 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import { Web3Context } from 'web3-core';
+import { Web3Context } from '@etn-sc/web3-core';
 
 import { CustomRpcMethodsPlugin } from '../../src/custom_rpc_methods';
 
diff --git a/tools/web3-plugin-example/test/web3_export_helper.ts b/tools/web3-plugin-example/test/web3_export_helper.ts
index 848ef956ea4..534f448a2e1 100644
--- a/tools/web3-plugin-example/test/web3_export_helper.ts
+++ b/tools/web3-plugin-example/test/web3_export_helper.ts
@@ -14,6 +14,6 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
-import Web3 from 'web3';
+import Web3 from '@etn-sc/web3';
 
 export { Web3 };