diff --git a/fxsdk/client/marginx.py b/fxsdk/client/marginx.py
index 34fd931..db7061d 100644
--- a/fxsdk/client/marginx.py
+++ b/fxsdk/client/marginx.py
@@ -15,7 +15,7 @@
     QueryPairFundingRatesReq, QueryOrderbookReq, QueryMarkPriceReq
 
 
-class MxClient(Client):
+class MarginXClient(Client):
 
     def __init__(self, url: str = 'localhost:9090'):
         super().__init__(url)
diff --git a/tests/test_mx_query.py b/tests/test_marginx_query.py
similarity index 86%
rename from tests/test_mx_query.py
rename to tests/test_marginx_query.py
index 2b4559a..18a31ad 100644
--- a/tests/test_mx_query.py
+++ b/tests/test_marginx_query.py
@@ -1,8 +1,8 @@
 import unittest
 
-from fxsdk.client.marginx import MxClient
+from fxsdk.client.marginx import MarginXClient
 
-grpc_cli = MxClient('localhost:9090')
+grpc_cli = MarginXClient('localhost:9090')
 
 pair_id = 'btc:cusd'