diff --git a/README.md b/README.md
index 4ca7da2..2a22b0e 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ pip install fx-py-sdk
 ## Use
 
 ```python
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 
 if __name__ == '__main__':
     chain_id = Client(url='localhost:9090').query_chain_id()
diff --git a/examples/bank.py b/examples/bank.py
index 899c27e..ec51b1a 100644
--- a/examples/bank.py
+++ b/examples/bank.py
@@ -1,4 +1,4 @@
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 from fxsdk.wallet.builder import TxBuilder
 from fxsdk.x.cosmos.base.v1beta1.coin_pb2 import Coin
 
diff --git a/examples/clean_balance.py b/examples/clean_balance.py
index 9212867..ae7fa85 100644
--- a/examples/clean_balance.py
+++ b/examples/clean_balance.py
@@ -1,6 +1,6 @@
 from google.protobuf.any_pb2 import Any
 
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 from fxsdk.wallet.builder import TxBuilder
 from fxsdk.wallet.key import PrivateKey
 from fxsdk.wallet.key import mnemonic_to_privkey
diff --git a/fxsdk/client/grpc_client.py b/fxsdk/client/grpc.py
similarity index 100%
rename from fxsdk/client/grpc_client.py
rename to fxsdk/client/grpc.py
diff --git a/fxsdk/client/jsonrpc_client.py b/fxsdk/client/jsonrpc.py
similarity index 100%
rename from fxsdk/client/jsonrpc_client.py
rename to fxsdk/client/jsonrpc.py
diff --git a/fxsdk/client/mx_client.py b/fxsdk/client/marginx.py
similarity index 98%
rename from fxsdk/client/mx_client.py
rename to fxsdk/client/marginx.py
index a6ad7ff..34fd931 100644
--- a/fxsdk/client/mx_client.py
+++ b/fxsdk/client/marginx.py
@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 from fxsdk.dec import dec_from_str
 from fxsdk.msg.dex import new_position_from_proto, new_order_from_proto, Order, Position, \
     new_pair_funding_rate_from_proto, PairFundingRate, OrderDepths, PairPrice, new_order_depths_from_proto
diff --git a/tests/test_grpc_query.py b/tests/test_grpc_query.py
index 0eaf066..844799b 100644
--- a/tests/test_grpc_query.py
+++ b/tests/test_grpc_query.py
@@ -1,6 +1,6 @@
 import unittest
 
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 
 grpc_cli = Client('localhost:9090')
 
diff --git a/tests/test_jsonrpc_query.py b/tests/test_jsonrpc_query.py
index 842e4c4..d58a89d 100644
--- a/tests/test_jsonrpc_query.py
+++ b/tests/test_jsonrpc_query.py
@@ -1,6 +1,6 @@
 import unittest
 
-from fxsdk.client.jsonrpc_client import *
+from fxsdk.client.jsonrpc import JsonRpcClient
 
 rpc_client = JsonRpcClient("http://127.0.0.1:26657")
 
diff --git a/tests/test_mx_query.py b/tests/test_mx_query.py
index a3ab4b7..2b4559a 100644
--- a/tests/test_mx_query.py
+++ b/tests/test_mx_query.py
@@ -1,6 +1,6 @@
 import unittest
 
-from fxsdk.client.mx_client import MxClient
+from fxsdk.client.marginx import MxClient
 
 grpc_cli = MxClient('localhost:9090')
 
diff --git a/tests/test_send_tx.py b/tests/test_send_tx.py
index 1bda35c..e9d948c 100644
--- a/tests/test_send_tx.py
+++ b/tests/test_send_tx.py
@@ -5,7 +5,7 @@
 from fxsdk.msg import new_msg_send
 from fxsdk.wallet.key import mnemonic_to_privkey
 from fxsdk.wallet.builder import TxBuilder
-from fxsdk.client.grpc_client import Client
+from fxsdk.client.grpc import Client
 from fxsdk.x.cosmos.base.v1beta1.coin_pb2 import Coin
 from fxsdk.x.cosmos.tx.v1beta1.service_pb2 import BROADCAST_MODE_SYNC