14 files changed, 23 insertions, 36 deletions
diff --git a/.prettierignore b/.prettierignore
index c2ebff4a0..d0be9ca09 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -27,3 +27,6 @@ lib
 package.json
 scripts/postpublish_utils.js
 packages/sol-cov/test/fixtures/artifacts
+.pytest_cache
+.mypy_cache
+.tox
diff --git a/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
index 174a8fdc3..fad0bd371 100644
--- a/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
+++ b/packages/json-schemas/schemas/asset_pairs_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/AssetPairsRequestOpts",
+    "id": "/AssetPairsRequestOptsSchema",
     "type": "object",
     "properties": {
         "assetDataA": { "$ref": "/hexSchema" },
diff --git a/packages/json-schemas/schemas/call_data_schema.json b/packages/json-schemas/schemas/call_data_schema.json
index c5972e8c1..e5e6e3282 100644
--- a/packages/json-schemas/schemas/call_data_schema.json
+++ b/packages/json-schemas/schemas/call_data_schema.json
@@ -4,13 +4,13 @@
         "from": { "$ref": "/addressSchema" },
         "to": { "$ref": "/addressSchema" },
         "value": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gas": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gasPrice": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "data": {
             "type": "string",
diff --git a/packages/json-schemas/schemas/ec_signature_schema.json b/packages/json-schemas/schemas/ec_signature_schema.json
index bc79ca5e9..52ccfe7bb 100644
--- a/packages/json-schemas/schemas/ec_signature_schema.json
+++ b/packages/json-schemas/schemas/ec_signature_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/ECSignature",
+    "id": "/ecSignatureSchema",
     "properties": {
         "v": {
             "type": "number",
diff --git a/packages/json-schemas/schemas/js_number.json b/packages/json-schemas/schemas/js_number_schema.json
index 6a72d92c0..7df1c4747 100644
--- a/packages/json-schemas/schemas/js_number.json
+++ b/packages/json-schemas/schemas/js_number_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/jsNumber",
+    "id": "/jsNumberSchema",
     "type": "number",
     "minimum": 0
 }
diff --git a/packages/json-schemas/schemas/order_config_request_schema.json b/packages/json-schemas/schemas/order_config_request_schema.json
index ca9b2e30e..19b043e7f 100644
--- a/packages/json-schemas/schemas/order_config_request_schema.json
+++ b/packages/json-schemas/schemas/order_config_request_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/OrderConfigRequest",
+    "id": "/OrderConfigRequestSchema",
     "type": "object",
     "properties": {
         "makerAddress": { "$ref": "/addressSchema" },
diff --git a/packages/json-schemas/schemas/orderbook_request_schema.json b/packages/json-schemas/schemas/orderbook_request_schema.json
index 27848bdcb..5ce6e8ab0 100644
--- a/packages/json-schemas/schemas/orderbook_request_schema.json
+++ b/packages/json-schemas/schemas/orderbook_request_schema.json
@@ -1,9 +1,9 @@
 {
-    "id": "/OrderBookRequest",
+    "id": "/OrderbookRequestSchema",
     "type": "object",
     "properties": {
         "baseAssetData": { "$ref": "/hexSchema" },
         "quoteAssetData": { "$ref": "/hexSchema" }
     },
     "required": ["baseAssetData", "quoteAssetData"]
-}
-\ No newline at end of file
+}
diff --git a/packages/json-schemas/schemas/orders_request_opts_schema.json b/packages/json-schemas/schemas/orders_request_opts_schema.json
index 10da51060..4c1b9b4e9 100644
--- a/packages/json-schemas/schemas/orders_request_opts_schema.json
+++ b/packages/json-schemas/schemas/orders_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/OrdersRequestOpts",
+    "id": "/OrdersRequestOptsSchema",
     "type": "object",
     "properties": {
         "makerAssetProxyId": { "$ref": "/hexSchema" },
diff --git a/packages/json-schemas/schemas/paged_request_opts_schema.json b/packages/json-schemas/schemas/paged_request_opts_schema.json
index 7cfc73947..f143c28b0 100644
--- a/packages/json-schemas/schemas/paged_request_opts_schema.json
+++ b/packages/json-schemas/schemas/paged_request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/PagedRequestOpts",
+    "id": "/PagedRequestOptsSchema",
     "type": "object",
     "properties": {
         "page": { "type": "number" },
diff --git a/packages/json-schemas/schemas/request_opts_schema.json b/packages/json-schemas/schemas/request_opts_schema.json
index b50547d18..2206f5016 100644
--- a/packages/json-schemas/schemas/request_opts_schema.json
+++ b/packages/json-schemas/schemas/request_opts_schema.json
@@ -1,5 +1,5 @@
 {
-    "id": "/RequestOpts",
+    "id": "/RequestOptsSchema",
     "type": "object",
     "properties": {
         "networkId": { "type": "number" }
diff --git a/packages/json-schemas/schemas/tx_data_schema.json b/packages/json-schemas/schemas/tx_data_schema.json
index 4643521ce..8c3daba4e 100644
--- a/packages/json-schemas/schemas/tx_data_schema.json
+++ b/packages/json-schemas/schemas/tx_data_schema.json
@@ -4,13 +4,13 @@
         "from": { "$ref": "/addressSchema" },
         "to": { "$ref": "/addressSchema" },
         "value": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gas": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "gasPrice": {
-            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumber" }]
+            "oneOf": [{ "$ref": "/numberSchema" }, { "$ref": "/jsNumberSchema" }]
         },
         "data": {
             "type": "string",
diff --git a/packages/json-schemas/src/schemas.ts b/packages/json-schemas/src/schemas.ts
index 21a6f424c..44673383d 100644
--- a/packages/json-schemas/src/schemas.ts
+++ b/packages/json-schemas/src/schemas.ts
@@ -8,7 +8,7 @@ import * as ecSignatureSchema from '../schemas/ec_signature_schema.json';
 import * as eip712TypedDataSchema from '../schemas/eip712_typed_data_schema.json';
 import * as hexSchema from '../schemas/hex_schema.json';
 import * as indexFilterValuesSchema from '../schemas/index_filter_values_schema.json';
-import * as jsNumber from '../schemas/js_number.json';
+import * as jsNumber from '../schemas/js_number_schema.json';
 import * as numberSchema from '../schemas/number_schema.json';
 import * as orderCancellationRequestsSchema from '../schemas/order_cancel_schema.json';
 import * as orderConfigRequestSchema from '../schemas/order_config_request_schema.json';
diff --git a/packages/json-schemas/tsconfig.json b/packages/json-schemas/tsconfig.json
index a79d54385..11e68b6fb 100644
--- a/packages/json-schemas/tsconfig.json
+++ b/packages/json-schemas/tsconfig.json
@@ -40,7 +40,7 @@
         "./schemas/relayer_api_orders_schema.json",
         "./schemas/signed_orders_schema.json",
         "./schemas/token_schema.json",
-        "./schemas/js_number.json",
+        "./schemas/js_number_schema.json",
         "./schemas/zero_ex_transaction_schema.json",
         "./schemas/tx_data_schema.json",
         "./schemas/index_filter_values_schema.json",
diff --git a/python-packages/json_schemas/src/zero_ex/json_schemas/__init__.py b/python-packages/json_schemas/src/zero_ex/json_schemas/__init__.py
index 1752c5761..792e6041f 100644
--- a/python-packages/json_schemas/src/zero_ex/json_schemas/__init__.py
+++ b/python-packages/json_schemas/src/zero_ex/json_schemas/__init__.py
@@ -17,23 +17,7 @@ class _LocalRefResolver(jsonschema.RefResolver):
         jsonschema.RefResolver.__init__(self, "", "")
 
     @staticmethod
-    def _ref_to_file(ref: str) -> str:
-        """Translate a JSON schema ref to its corresponding file name.
-
-        >>> _LocalRefResolver._ref_to_file("/addressSchema")
-        'address_schema.json'
-        """
-        _ref = ref.lstrip("/")
-
-        # handle weird special cases
-        _ref = _ref.replace("ECSignature", "EcSignature")
-        if _ref.endswith("Schema"):
-            # strip off the Schema suffix
-            _ref = _ref[:-6]
-
-        return f"{snakecase(_ref)}_schema.json"
-
-    def resolve_from_url(self, url: str) -> str:
+    def resolve_from_url(url: str) -> str:
         """Resolve the given URL.
 
         :param url: a string representing the URL of the JSON schema to fetch.
@@ -45,7 +29,7 @@ class _LocalRefResolver(jsonschema.RefResolver):
         return json.loads(
             resource_string(
                 "zero_ex.json_schemas",
-                f"schemas/{_LocalRefResolver._ref_to_file(ref)}",
+                f"schemas/{snakecase(ref.lstrip('/'))}.json",
             )
         )
 
@@ -68,7 +52,7 @@ def assert_valid(data: Mapping, schema_id: str) -> None:
 
     >>> assert_valid(
     ...     {'v': 27, 'r': '0x'+'f'*64, 's': '0x'+'f'*64},
-    ...     '/ECSignature',
+    ...     '/ecSignatureSchema',
     ... )
     """
     # noqa