diff --git a/src/extensions/components/execution-errors.yaml b/src/extensions/components/execution-errors.yaml
index baa54f8fe..69b7ac7c5 100644
--- a/src/extensions/components/execution-errors.yaml
+++ b/src/extensions/components/execution-errors.yaml
@@ -1,14 +1,24 @@
 x-error-group:
   ExecutionErrors:
-      - code: -31800
-        message: "Nonce too low"
-        data: "Transaction nonce is lower than the sender account's current nonce"
-      - code: -31801
-        message: "Nonce too high"
-        data: "Transaction nonce is higher than the sender account's current nonce"
-      - code: -31802
-        message: "Execution reverted"
-        data: "Execution is reverted by REVERT Opcode"
-      - code: -31803
-        message: "Invalid opcode"
-        data: "An invalid opcode was encountered during execution"
\ No newline at end of file
+    - code: -31800
+      message: "NONCE_TOO_LOW"
+      data: "Transaction nonce is lower than the sender account's current nonce"
+    - code: -31801
+      message: "NONCE_TOO_HIGH"
+      data: "Transaction nonce is higher than the sender account's current nonce"
+    - code: -31802
+      message: "EXECUTION_REVERTED"
+      data: "Execution is reverted by REVERT Opcode"
+    - code: -31803
+      message: "INVALID_OPCODE"
+      data: "An invalid opcode was encountered during execution"
+    - code: -31804
+      message: "OUT_OF_COUNTERS"
+      data: "Not enough step counters to continue the execution"
+      x-metadata:
+        severity: "error"
+        must-implement: true
+        clients:
+          - "polygon-cdk":
+              - message: "Out of counters"
+              - version: ">=0.5.0"
diff --git a/src/extensions/components/gas-error-groups.yaml b/src/extensions/components/gas-error-groups.yaml
index 66f350cae..936d25bee 100644
--- a/src/extensions/components/gas-error-groups.yaml
+++ b/src/extensions/components/gas-error-groups.yaml
@@ -1,32 +1,32 @@
 x-error-group:
   GasErrors:
-      - code: -31800
-        message: "Gas too low"
-        data: "Transaction gas is too low / intrinsic gas too low"
-      - code: -31801
-        message: "Out of gas"
-        data: "The transaction ran out of gas"
-      - code: -31802
-        message: "Gas Price too low"
-        data: "Gas price too low / gas price below configured minimum gas price"
-      - code: -31803
-        message: "Exceeded Block gas limit"
-        data: "Tx gas limit exceeds max block gas limit / intrinsic gas exceeds gas limit"
-      - code: -31804
-        message: "Exceeded Fee cap"
-        data: "Tx fee exceeds cap / max priority fee per gas higher than max fee per gas"
-      - code: -31805
-        message: "Gas overflow"
-        data: "Gas overflow error"
-      - code: -31806
-        message: "Price lower than the base fee"
-        data: "Transaction price must be greater than base fee / max fee per gas less than block base fee"
-      - code: -31807
-        message: "Max priority fee overflow"
-        data: "Max priority fee per gas higher than 2^256-1"
-      - code: -31808
-        message: "Max fee overflow"
-        data: "Max fee per gas higher than 2^256-1"
-      - code: -31809
-        message: "Insufficient funds"
-        data: "Insufficient funds for gas * price + value"
+    - code: -31800
+      message: "GAS_TOO_LOW"
+      data: "Transaction gas is too low / intrinsic gas too low"
+    - code: -31801
+      message: "OUT_OF_GAS"
+      data: "The transaction ran out of gas"
+    - code: -31802
+      message: "GAS_PRICE_TOO_LOW"
+      data: "Gas price too low / gas price below configured minimum gas price"
+    - code: -31803
+      message: "BLOCK_GAS_LIMIT_EXCEEDED"
+      data: "Tx gas limit exceeds max block gas limit / intrinsic gas exceeds gas limit"
+    - code: -31804
+      message: "FEE_CAP_EXCEEDED"
+      data: "Tx fee exceeds cap / max priority fee per gas higher than max fee per gas"
+    - code: -31805
+      message: "GAS_OVERFLOW"
+      data: "Gas overflow error"
+    - code: -31806
+      message: "INSUFFICIENT_TRANSACTION_PRICE"
+      data: "Transaction price must be greater than base fee / max fee per gas less than block base fee"
+    - code: -31807
+      message: "INVALID_MAX_PRIORITY_FEE_PER_GAS"
+      data: "Max priority fee per gas higher than 2^256-1"
+    - code: -31808
+      message: "INVALID_MAX_FEE_PER_GAS"
+      data: "Max fee per gas higher than 2^256-1"
+    - code: -31809
+      message: "INSUFFICIENT_FUNDS"
+      data: "Insufficient funds for gas * price + value"