diff --git a/pdr_backend/models/erc721_factory.py b/pdr_backend/models/erc721_factory.py
index 991f0f436..8d059963c 100644
--- a/pdr_backend/models/erc721_factory.py
+++ b/pdr_backend/models/erc721_factory.py
@@ -7,12 +7,12 @@
 
 
 @enforce_types
-class ERC721Factory(BaseContract):
+class Erc721Factory(BaseContract):
     def __init__(self, web3_pp):
-        address = get_address(web3_pp, "ERC721Factory")
+        address = get_address(web3_pp, "Erc721Factory")
         if not address:
-            raise ValueError("Cannot figure out ERC721Factory address")
-        super().__init__(web3_pp, address, "ERC721Factory")
+            raise ValueError("Cannot figure out Erc721Factory address")
+        super().__init__(web3_pp, address, "Erc721Factory")
 
     def createNftWithErc20WithFixedRate(self, NftCreateData, ErcCreateData, FixedData):
         call_params = tx_call_params(self.web3_pp)
diff --git a/pdr_backend/models/test/test_data_nft.py b/pdr_backend/models/test/test_data_nft.py
index e038b6476..d35ebfb2f 100644
--- a/pdr_backend/models/test/test_data_nft.py
+++ b/pdr_backend/models/test/test_data_nft.py
@@ -6,7 +6,7 @@
 from web3.logs import DISCARD
 
 from pdr_backend.models.data_nft import DataNft
-from pdr_backend.models.erc721_factory import ERC721Factory
+from pdr_backend.models.erc721_factory import Erc721Factory
 from pdr_backend.util.constants import MAX_UINT
 from pdr_backend.util.contract import get_address
 
@@ -26,7 +26,7 @@ def test_set_ddo(web3_pp, web3_config):
     owner = Account.from_key(  # pylint:disable=no-value-for-parameter
         private_key=private_key
     )
-    factory = ERC721Factory(web3_pp)
+    factory = Erc721Factory(web3_pp)
     ocean_address = get_address(web3_pp, "Ocean")
     fre_address = get_address(web3_pp, "FixedPrice")
 
diff --git a/pdr_backend/models/test/test_erc721_factory.py b/pdr_backend/models/test/test_erc721_factory.py
index baab9fdad..a2fe54009 100644
--- a/pdr_backend/models/test/test_erc721_factory.py
+++ b/pdr_backend/models/test/test_erc721_factory.py
@@ -1,12 +1,12 @@
 from enforce_typing import enforce_types
 
-from pdr_backend.models.erc721_factory import ERC721Factory
+from pdr_backend.models.erc721_factory import Erc721Factory
 from pdr_backend.util.contract import get_address
 
 
 @enforce_types
-def test_ERC721Factory(web3_pp, web3_config):
-    factory = ERC721Factory(web3_pp)
+def test_Erc721Factory(web3_pp, web3_config):
+    factory = Erc721Factory(web3_pp)
     assert factory is not None
 
     ocean_address = get_address(web3_pp, "Ocean")
diff --git a/pdr_backend/publisher/publish_asset.py b/pdr_backend/publisher/publish_asset.py
index 0f30ae391..162b3eaa1 100644
--- a/pdr_backend/publisher/publish_asset.py
+++ b/pdr_backend/publisher/publish_asset.py
@@ -3,7 +3,7 @@
 from enforce_typing import enforce_types
 
 from pdr_backend.models.data_nft import DataNft
-from pdr_backend.models.erc721_factory import ERC721Factory
+from pdr_backend.models.erc721_factory import Erc721Factory
 from pdr_backend.ppss.web3_pp import Web3PP
 from pdr_backend.util.contract import get_address
 
@@ -31,7 +31,7 @@ def publish_asset(
     owner = web3_config.owner
     ocean_address = get_address(web3_pp, "Ocean")
     fre_address = get_address(web3_pp, "FixedPrice")
-    factory = ERC721Factory(web3_pp)
+    factory = Erc721Factory(web3_pp)
 
     feeCollector = web3_config.w3.to_checksum_address(feeCollector_addr)
     trueval_submiter = web3_config.w3.to_checksum_address(trueval_submitter_addr)
diff --git a/pdr_backend/trader/approach2/portfolio.py b/pdr_backend/trader/approach2/portfolio.py
index 00732b4cc..6d3db1510 100644
--- a/pdr_backend/trader/approach2/portfolio.py
+++ b/pdr_backend/trader/approach2/portfolio.py
@@ -36,7 +36,7 @@ def timestamp(self):
         return None
 
 
-class MEXCOrder(Order):
+class MexcOrder(Order):
     def __init__(self, order: Dict):  # pylint: disable=useless-parent-delegation
         super().__init__(order)
 
@@ -56,7 +56,7 @@ def timestamp(self):
 
 def create_order(order: Dict, exchange: ccxt.Exchange) -> Order:
     if exchange in ("mexc"):
-        return MEXCOrder(order)
+        return MexcOrder(order)
     return Order(order)