diff --git a/clients/tfchain-client-go/.github/workflows/lint.yml b/clients/tfchain_client_go/.github/workflows/lint.yml
similarity index 100%
rename from clients/tfchain-client-go/.github/workflows/lint.yml
rename to clients/tfchain_client_go/.github/workflows/lint.yml
diff --git a/clients/tfchain-client-go/.github/workflows/test.yml b/clients/tfchain_client_go/.github/workflows/test.yml
similarity index 100%
rename from clients/tfchain-client-go/.github/workflows/test.yml
rename to clients/tfchain_client_go/.github/workflows/test.yml
diff --git a/clients/tfchain-client-go/CODEOWNERS b/clients/tfchain_client_go/CODEOWNERS
similarity index 100%
rename from clients/tfchain-client-go/CODEOWNERS
rename to clients/tfchain_client_go/CODEOWNERS
diff --git a/clients/tfchain-client-go/account.go b/clients/tfchain_client_go/account.go
similarity index 100%
rename from clients/tfchain-client-go/account.go
rename to clients/tfchain_client_go/account.go
diff --git a/clients/tfchain-client-go/account_test.go b/clients/tfchain_client_go/account_test.go
similarity index 100%
rename from clients/tfchain-client-go/account_test.go
rename to clients/tfchain_client_go/account_test.go
diff --git a/clients/tfchain-client-go/blocks.go b/clients/tfchain_client_go/blocks.go
similarity index 100%
rename from clients/tfchain-client-go/blocks.go
rename to clients/tfchain_client_go/blocks.go
diff --git a/clients/tfchain-client-go/bridge.go b/clients/tfchain_client_go/bridge.go
similarity index 100%
rename from clients/tfchain-client-go/bridge.go
rename to clients/tfchain_client_go/bridge.go
diff --git a/clients/tfchain-client-go/burn_events.go b/clients/tfchain_client_go/burn_events.go
similarity index 100%
rename from clients/tfchain-client-go/burn_events.go
rename to clients/tfchain_client_go/burn_events.go
diff --git a/clients/tfchain-client-go/burning.go b/clients/tfchain_client_go/burning.go
similarity index 100%
rename from clients/tfchain-client-go/burning.go
rename to clients/tfchain_client_go/burning.go
diff --git a/clients/tfchain-client-go/contract.go b/clients/tfchain_client_go/contract.go
similarity index 100%
rename from clients/tfchain-client-go/contract.go
rename to clients/tfchain_client_go/contract.go
diff --git a/clients/tfchain-client-go/contract_events.go b/clients/tfchain_client_go/contract_events.go
similarity index 100%
rename from clients/tfchain-client-go/contract_events.go
rename to clients/tfchain_client_go/contract_events.go
diff --git a/clients/tfchain-client-go/contract_test.go b/clients/tfchain_client_go/contract_test.go
similarity index 100%
rename from clients/tfchain-client-go/contract_test.go
rename to clients/tfchain_client_go/contract_test.go
diff --git a/clients/tfchain-client-go/dao.go b/clients/tfchain_client_go/dao.go
similarity index 100%
rename from clients/tfchain-client-go/dao.go
rename to clients/tfchain_client_go/dao.go
diff --git a/clients/tfchain-client-go/depositfee.go b/clients/tfchain_client_go/depositfee.go
similarity index 100%
rename from clients/tfchain-client-go/depositfee.go
rename to clients/tfchain_client_go/depositfee.go
diff --git a/clients/tfchain-client-go/entity.go b/clients/tfchain_client_go/entity.go
similarity index 100%
rename from clients/tfchain-client-go/entity.go
rename to clients/tfchain_client_go/entity.go
diff --git a/clients/tfchain-client-go/events.go b/clients/tfchain_client_go/events.go
similarity index 100%
rename from clients/tfchain-client-go/events.go
rename to clients/tfchain_client_go/events.go
diff --git a/clients/tfchain-client-go/events_test.go b/clients/tfchain_client_go/events_test.go
similarity index 100%
rename from clients/tfchain-client-go/events_test.go
rename to clients/tfchain_client_go/events_test.go
diff --git a/clients/tfchain-client-go/farm.go b/clients/tfchain_client_go/farm.go
similarity index 100%
rename from clients/tfchain-client-go/farm.go
rename to clients/tfchain_client_go/farm.go
diff --git a/clients/tfchain-client-go/farm_test.go b/clients/tfchain_client_go/farm_test.go
similarity index 100%
rename from clients/tfchain-client-go/farm_test.go
rename to clients/tfchain_client_go/farm_test.go
diff --git a/clients/tfchain-client-go/go.mod b/clients/tfchain_client_go/go.mod
similarity index 96%
rename from clients/tfchain-client-go/go.mod
rename to clients/tfchain_client_go/go.mod
index df35dd76f..27a082f94 100644
--- a/clients/tfchain-client-go/go.mod
+++ b/clients/tfchain_client_go/go.mod
@@ -1,4 +1,4 @@
-module github.com/threefoldtech/tfchain/clients/tfchain-client-go
+module github.com/threefoldtech/substrate-client
 
 go 1.17
 
diff --git a/clients/tfchain-client-go/go.sum b/clients/tfchain_client_go/go.sum
similarity index 100%
rename from clients/tfchain-client-go/go.sum
rename to clients/tfchain_client_go/go.sum
diff --git a/clients/tfchain-client-go/impl.go b/clients/tfchain_client_go/impl.go
similarity index 100%
rename from clients/tfchain-client-go/impl.go
rename to clients/tfchain_client_go/impl.go
diff --git a/clients/tfchain-client-go/minting.go b/clients/tfchain_client_go/minting.go
similarity index 100%
rename from clients/tfchain-client-go/minting.go
rename to clients/tfchain_client_go/minting.go
diff --git a/clients/tfchain-client-go/node.go b/clients/tfchain_client_go/node.go
similarity index 100%
rename from clients/tfchain-client-go/node.go
rename to clients/tfchain_client_go/node.go
diff --git a/clients/tfchain-client-go/node_test.go b/clients/tfchain_client_go/node_test.go
similarity index 100%
rename from clients/tfchain-client-go/node_test.go
rename to clients/tfchain_client_go/node_test.go
diff --git a/clients/tfchain-client-go/readme.md b/clients/tfchain_client_go/readme.md
similarity index 100%
rename from clients/tfchain-client-go/readme.md
rename to clients/tfchain_client_go/readme.md
diff --git a/clients/tfchain-client-go/refunds.go b/clients/tfchain_client_go/refunds.go
similarity index 100%
rename from clients/tfchain-client-go/refunds.go
rename to clients/tfchain_client_go/refunds.go
diff --git a/clients/tfchain-client-go/retrying_client.go b/clients/tfchain_client_go/retrying_client.go
similarity index 100%
rename from clients/tfchain-client-go/retrying_client.go
rename to clients/tfchain_client_go/retrying_client.go
diff --git a/clients/tfchain-client-go/service_contract.go b/clients/tfchain_client_go/service_contract.go
similarity index 100%
rename from clients/tfchain-client-go/service_contract.go
rename to clients/tfchain_client_go/service_contract.go
diff --git a/clients/tfchain-client-go/service_contract_test.go b/clients/tfchain_client_go/service_contract_test.go
similarity index 100%
rename from clients/tfchain-client-go/service_contract_test.go
rename to clients/tfchain_client_go/service_contract_test.go
diff --git a/clients/tfchain-client-go/tc_test.go b/clients/tfchain_client_go/tc_test.go
similarity index 100%
rename from clients/tfchain-client-go/tc_test.go
rename to clients/tfchain_client_go/tc_test.go
diff --git a/clients/tfchain-client-go/termsandconditions.go b/clients/tfchain_client_go/termsandconditions.go
similarity index 100%
rename from clients/tfchain-client-go/termsandconditions.go
rename to clients/tfchain_client_go/termsandconditions.go
diff --git a/clients/tfchain-client-go/tft_bridge_events.go b/clients/tfchain_client_go/tft_bridge_events.go
similarity index 100%
rename from clients/tfchain-client-go/tft_bridge_events.go
rename to clients/tfchain_client_go/tft_bridge_events.go
diff --git a/clients/tfchain-client-go/transfer.go b/clients/tfchain_client_go/transfer.go
similarity index 100%
rename from clients/tfchain-client-go/transfer.go
rename to clients/tfchain_client_go/transfer.go
diff --git a/clients/tfchain-client-go/transfer_test.go b/clients/tfchain_client_go/transfer_test.go
similarity index 100%
rename from clients/tfchain-client-go/transfer_test.go
rename to clients/tfchain_client_go/transfer_test.go
diff --git a/clients/tfchain-client-go/twin.go b/clients/tfchain_client_go/twin.go
similarity index 100%
rename from clients/tfchain-client-go/twin.go
rename to clients/tfchain_client_go/twin.go
diff --git a/clients/tfchain-client-go/twin_test.go b/clients/tfchain_client_go/twin_test.go
similarity index 100%
rename from clients/tfchain-client-go/twin_test.go
rename to clients/tfchain_client_go/twin_test.go
diff --git a/clients/tfchain-client-go/types.go b/clients/tfchain_client_go/types.go
similarity index 100%
rename from clients/tfchain-client-go/types.go
rename to clients/tfchain_client_go/types.go
diff --git a/clients/tfchain-client-go/user.go b/clients/tfchain_client_go/user.go
similarity index 100%
rename from clients/tfchain-client-go/user.go
rename to clients/tfchain_client_go/user.go
diff --git a/clients/tfchain-client-go/utils.go b/clients/tfchain_client_go/utils.go
similarity index 100%
rename from clients/tfchain-client-go/utils.go
rename to clients/tfchain_client_go/utils.go
diff --git a/clients/tfchain-client-go/utils_test.go b/clients/tfchain_client_go/utils_test.go
similarity index 100%
rename from clients/tfchain-client-go/utils_test.go
rename to clients/tfchain_client_go/utils_test.go
diff --git a/clients/tfchain-client-go/validator.go b/clients/tfchain_client_go/validator.go
similarity index 100%
rename from clients/tfchain-client-go/validator.go
rename to clients/tfchain_client_go/validator.go
diff --git a/clients/tfchain-client-go/zos_version.go b/clients/tfchain_client_go/zos_version.go
similarity index 100%
rename from clients/tfchain-client-go/zos_version.go
rename to clients/tfchain_client_go/zos_version.go
diff --git a/clients/tfchain-client-js/.gitignore b/clients/tfchain_client_js/.gitignore
similarity index 100%
rename from clients/tfchain-client-js/.gitignore
rename to clients/tfchain_client_js/.gitignore
diff --git a/clients/tfchain-client-js/LICENSE b/clients/tfchain_client_js/LICENSE
similarity index 100%
rename from clients/tfchain-client-js/LICENSE
rename to clients/tfchain_client_js/LICENSE
diff --git a/clients/tfchain-client-js/index.js b/clients/tfchain_client_js/index.js
similarity index 100%
rename from clients/tfchain-client-js/index.js
rename to clients/tfchain_client_js/index.js
diff --git a/clients/tfchain-client-js/lib/balance.js b/clients/tfchain_client_js/lib/balance.js
similarity index 100%
rename from clients/tfchain-client-js/lib/balance.js
rename to clients/tfchain_client_js/lib/balance.js
diff --git a/clients/tfchain-client-js/lib/chain.js b/clients/tfchain_client_js/lib/chain.js
similarity index 100%
rename from clients/tfchain-client-js/lib/chain.js
rename to clients/tfchain_client_js/lib/chain.js
diff --git a/clients/tfchain-client-js/lib/client.js b/clients/tfchain_client_js/lib/client.js
similarity index 100%
rename from clients/tfchain-client-js/lib/client.js
rename to clients/tfchain_client_js/lib/client.js
diff --git a/clients/tfchain-client-js/lib/contract.js b/clients/tfchain_client_js/lib/contract.js
similarity index 100%
rename from clients/tfchain-client-js/lib/contract.js
rename to clients/tfchain_client_js/lib/contract.js
diff --git a/clients/tfchain-client-js/lib/entity.js b/clients/tfchain_client_js/lib/entity.js
similarity index 100%
rename from clients/tfchain-client-js/lib/entity.js
rename to clients/tfchain_client_js/lib/entity.js
diff --git a/clients/tfchain-client-js/lib/farms.js b/clients/tfchain_client_js/lib/farms.js
similarity index 100%
rename from clients/tfchain-client-js/lib/farms.js
rename to clients/tfchain_client_js/lib/farms.js
diff --git a/clients/tfchain-client-js/lib/node.js b/clients/tfchain_client_js/lib/node.js
similarity index 100%
rename from clients/tfchain-client-js/lib/node.js
rename to clients/tfchain_client_js/lib/node.js
diff --git a/clients/tfchain-client-js/lib/pricing_policy.js b/clients/tfchain_client_js/lib/pricing_policy.js
similarity index 100%
rename from clients/tfchain-client-js/lib/pricing_policy.js
rename to clients/tfchain_client_js/lib/pricing_policy.js
diff --git a/clients/tfchain-client-js/lib/serviceContract.js b/clients/tfchain_client_js/lib/serviceContract.js
similarity index 100%
rename from clients/tfchain-client-js/lib/serviceContract.js
rename to clients/tfchain_client_js/lib/serviceContract.js
diff --git a/clients/tfchain-client-js/lib/sign.js b/clients/tfchain_client_js/lib/sign.js
similarity index 100%
rename from clients/tfchain-client-js/lib/sign.js
rename to clients/tfchain_client_js/lib/sign.js
diff --git a/clients/tfchain-client-js/lib/terms_and_conditions.js b/clients/tfchain_client_js/lib/terms_and_conditions.js
similarity index 100%
rename from clients/tfchain-client-js/lib/terms_and_conditions.js
rename to clients/tfchain_client_js/lib/terms_and_conditions.js
diff --git a/clients/tfchain-client-js/lib/tfkvstore.js b/clients/tfchain_client_js/lib/tfkvstore.js
similarity index 100%
rename from clients/tfchain-client-js/lib/tfkvstore.js
rename to clients/tfchain_client_js/lib/tfkvstore.js
diff --git a/clients/tfchain-client-js/lib/tft_price.js b/clients/tfchain_client_js/lib/tft_price.js
similarity index 100%
rename from clients/tfchain-client-js/lib/tft_price.js
rename to clients/tfchain_client_js/lib/tft_price.js
diff --git a/clients/tfchain-client-js/lib/twin.js b/clients/tfchain_client_js/lib/twin.js
similarity index 100%
rename from clients/tfchain-client-js/lib/twin.js
rename to clients/tfchain_client_js/lib/twin.js
diff --git a/clients/tfchain-client-js/lib/util.js b/clients/tfchain_client_js/lib/util.js
similarity index 100%
rename from clients/tfchain-client-js/lib/util.js
rename to clients/tfchain_client_js/lib/util.js
diff --git a/clients/tfchain-client-js/lib/utility.js b/clients/tfchain_client_js/lib/utility.js
similarity index 100%
rename from clients/tfchain-client-js/lib/utility.js
rename to clients/tfchain_client_js/lib/utility.js
diff --git a/clients/tfchain-client-js/lib/voting.js b/clients/tfchain_client_js/lib/voting.js
similarity index 100%
rename from clients/tfchain-client-js/lib/voting.js
rename to clients/tfchain_client_js/lib/voting.js
diff --git a/clients/tfchain-client-js/package-lock.json b/clients/tfchain_client_js/package-lock.json
similarity index 100%
rename from clients/tfchain-client-js/package-lock.json
rename to clients/tfchain_client_js/package-lock.json
diff --git a/clients/tfchain-client-js/package.json b/clients/tfchain_client_js/package.json
similarity index 100%
rename from clients/tfchain-client-js/package.json
rename to clients/tfchain_client_js/package.json
diff --git a/clients/tfchain-client-js/readme.md b/clients/tfchain_client_js/readme.md
similarity index 100%
rename from clients/tfchain-client-js/readme.md
rename to clients/tfchain_client_js/readme.md
diff --git a/clients/tfchain-client-js/types.json b/clients/tfchain_client_js/types.json
similarity index 100%
rename from clients/tfchain-client-js/types.json
rename to clients/tfchain_client_js/types.json
diff --git a/clients/tfchain-client-js/yarn.lock b/clients/tfchain_client_js/yarn.lock
similarity index 100%
rename from clients/tfchain-client-js/yarn.lock
rename to clients/tfchain_client_js/yarn.lock
diff --git a/clients/tfchain-client-rs/.gitignore b/clients/tfchain_client_rs/.gitignore
similarity index 100%
rename from clients/tfchain-client-rs/.gitignore
rename to clients/tfchain_client_rs/.gitignore
diff --git a/clients/tfchain-client-rs/Cargo.lock b/clients/tfchain_client_rs/Cargo.lock
similarity index 100%
rename from clients/tfchain-client-rs/Cargo.lock
rename to clients/tfchain_client_rs/Cargo.lock
diff --git a/clients/tfchain-client-rs/Cargo.toml b/clients/tfchain_client_rs/Cargo.toml
similarity index 100%
rename from clients/tfchain-client-rs/Cargo.toml
rename to clients/tfchain_client_rs/Cargo.toml
diff --git a/clients/tfchain-client-rs/artifacts/devnet.scale b/clients/tfchain_client_rs/artifacts/devnet.scale
similarity index 100%
rename from clients/tfchain-client-rs/artifacts/devnet.scale
rename to clients/tfchain_client_rs/artifacts/devnet.scale
diff --git a/clients/tfchain-client-rs/artifacts/local.scale b/clients/tfchain_client_rs/artifacts/local.scale
similarity index 100%
rename from clients/tfchain-client-rs/artifacts/local.scale
rename to clients/tfchain_client_rs/artifacts/local.scale
diff --git a/clients/tfchain-client-rs/artifacts/mainnet.scale b/clients/tfchain_client_rs/artifacts/mainnet.scale
similarity index 100%
rename from clients/tfchain-client-rs/artifacts/mainnet.scale
rename to clients/tfchain_client_rs/artifacts/mainnet.scale
diff --git a/clients/tfchain-client-rs/artifacts/testnet.scale b/clients/tfchain_client_rs/artifacts/testnet.scale
similarity index 100%
rename from clients/tfchain-client-rs/artifacts/testnet.scale
rename to clients/tfchain_client_rs/artifacts/testnet.scale
diff --git a/clients/tfchain-client-rs/readme.md b/clients/tfchain_client_rs/readme.md
similarity index 100%
rename from clients/tfchain-client-rs/readme.md
rename to clients/tfchain_client_rs/readme.md
diff --git a/clients/tfchain-client-rs/src/client.rs b/clients/tfchain_client_rs/src/client.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/client.rs
rename to clients/tfchain_client_rs/src/client.rs
diff --git a/clients/tfchain-client-rs/src/lib.rs b/clients/tfchain_client_rs/src/lib.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/lib.rs
rename to clients/tfchain_client_rs/src/lib.rs
diff --git a/clients/tfchain-client-rs/src/main.rs b/clients/tfchain_client_rs/src/main.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/main.rs
rename to clients/tfchain_client_rs/src/main.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/devnet.rs b/clients/tfchain_client_rs/src/runtimes/devnet.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/devnet.rs
rename to clients/tfchain_client_rs/src/runtimes/devnet.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/local.rs b/clients/tfchain_client_rs/src/runtimes/local.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/local.rs
rename to clients/tfchain_client_rs/src/runtimes/local.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/mainnet.rs b/clients/tfchain_client_rs/src/runtimes/mainnet.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/mainnet.rs
rename to clients/tfchain_client_rs/src/runtimes/mainnet.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/mod.rs b/clients/tfchain_client_rs/src/runtimes/mod.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/mod.rs
rename to clients/tfchain_client_rs/src/runtimes/mod.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/testnet.rs b/clients/tfchain_client_rs/src/runtimes/testnet.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/testnet.rs
rename to clients/tfchain_client_rs/src/runtimes/testnet.rs
diff --git a/clients/tfchain-client-rs/src/runtimes/types.rs b/clients/tfchain_client_rs/src/runtimes/types.rs
similarity index 100%
rename from clients/tfchain-client-rs/src/runtimes/types.rs
rename to clients/tfchain_client_rs/src/runtimes/types.rs