diff --git a/.changeset/twenty-hornets-clap.md b/.changeset/twenty-hornets-clap.md
new file mode 100644
index 000000000..e81554546
--- /dev/null
+++ b/.changeset/twenty-hornets-clap.md
@@ -0,0 +1,5 @@
+---
+'@openzeppelin/wizard': patch
+---
+
+Solidity account signer: Fix grammar in comment
diff --git a/packages/core/solidity/package.json b/packages/core/solidity/package.json
index 885d39cb4..92b7bdc7d 100644
--- a/packages/core/solidity/package.json
+++ b/packages/core/solidity/package.json
@@ -39,4 +39,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^5.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/core/solidity/src/account.test.ts.md b/packages/core/solidity/src/account.test.ts.md
index 2859db874..8b1d08595 100644
--- a/packages/core/solidity/src/account.test.ts.md
+++ b/packages/core/solidity/src/account.test.ts.md
@@ -1585,7 +1585,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerECDSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -1637,7 +1637,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerECDSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -1693,7 +1693,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerECDSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -1750,7 +1750,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerECDSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -2077,7 +2077,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2145,7 +2145,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2217,7 +2217,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2290,7 +2290,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2561,7 +2561,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2622,7 +2622,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2687,7 +2687,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2753,7 +2753,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -2957,7 +2957,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerEIP7702 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3007,7 +3007,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerEIP7702 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3063,7 +3063,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerEIP7702 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3120,7 +3120,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerEIP7702 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3345,7 +3345,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerP256 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerP256)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3397,7 +3397,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerP256 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerP256)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3456,7 +3456,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerP256 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerP256)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3516,7 +3516,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerP256 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerP256)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -3843,7 +3843,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -3911,7 +3911,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -3983,7 +3983,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4056,7 +4056,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4327,7 +4327,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4388,7 +4388,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4453,7 +4453,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4519,7 +4519,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerP256Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerP256Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerP256Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -4744,7 +4744,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerRSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerRSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -4796,7 +4796,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerRSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerRSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -4855,7 +4855,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerRSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerRSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -4915,7 +4915,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSA is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure SignerRSA is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerRSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -5242,7 +5242,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5310,7 +5310,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5382,7 +5382,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5455,7 +5455,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5726,7 +5726,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5787,7 +5787,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5852,7 +5852,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -5918,7 +5918,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerRSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure SignerRSAUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerRSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -6241,7 +6241,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -6307,7 +6307,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -6378,7 +6378,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -6450,7 +6450,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913 is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913 is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -6897,7 +6897,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -6980,7 +6980,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7067,7 +7067,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7155,7 +7155,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7546,7 +7546,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7622,7 +7622,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7702,7 +7702,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -7783,7 +7783,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913Upgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913Upgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -8163,7 +8163,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913Weighted is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -8237,7 +8237,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913Weighted is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -8316,7 +8316,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913Weighted is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -8396,7 +8396,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913Weighted is most derived than AccountERC7579␊
+        // IMPORTANT: Make sure MultiSignerERC7913Weighted is more derived than AccountERC7579␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., MultiSignerERC7913Weighted)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
@@ -8906,7 +8906,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -8997,7 +8997,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9092,7 +9092,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9188,7 +9188,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9642,7 +9642,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9726,7 +9726,7 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9814,7 +9814,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
@@ -9903,7 +9903,7 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // IMPORTANT: Make sure MultiSignerERC7913WeightedUpgradeable is more derived than AccountERC7579Upgradeable␊
         // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., MultiSignerERC7913WeightedUpgradeable)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
diff --git a/packages/core/solidity/src/account.test.ts.snap b/packages/core/solidity/src/account.test.ts.snap
index c47804a86..67e081549 100644
Binary files a/packages/core/solidity/src/account.test.ts.snap and b/packages/core/solidity/src/account.test.ts.snap differ
diff --git a/packages/core/solidity/src/account.ts b/packages/core/solidity/src/account.ts
index e28b16f63..3687328fb 100644
--- a/packages/core/solidity/src/account.ts
+++ b/packages/core/solidity/src/account.ts
@@ -256,7 +256,7 @@ function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions
     c.addOverride({ name: 'AccountERC7579' }, signerFunctions._rawSignatureValidation);
     c.setFunctionComments(
       [
-        `// IMPORTANT: Make sure ${signerName} is most derived than ${accountName}`,
+        `// IMPORTANT: Make sure ${signerName} is more derived than ${accountName}`,
         `// in the inheritance chain (i.e. contract ... is ${accountName}, ..., ${signerName})`,
         '// to ensure the correct order of function resolution.',
         `// ${accountName} returns false for _rawSignatureValidation`,
diff --git a/packages/core/solidity/src/erc20.ts b/packages/core/solidity/src/erc20.ts
index f39b6a59b..173a5c384 100644
--- a/packages/core/solidity/src/erc20.ts
+++ b/packages/core/solidity/src/erc20.ts
@@ -237,7 +237,7 @@ function addPremint(
  * Check for potential premint overflow assuming the user's contract has decimals() = 18
  *
  * @param baseUnits The base units of the token, before applying power of 10
- * @param decimalPlace If positive, the number of assumed decimal places in the least significant digits of `validatedBaseUnits`. Ignored if <= 0.
+ * @param decimalPlace If positive, the number of assumed decimal places in the least significant digits of `baseUnits`. Ignored if <= 0.
  * @throws OptionsError if the calculated value would overflow uint256
  */
 function checkPotentialPremintOverflow(baseUnits: bigint, decimalPlace: number) {
diff --git a/packages/core/solidity/src/utils/convert-strings.ts b/packages/core/solidity/src/utils/convert-strings.ts
index 04d03329c..2618d1c21 100644
--- a/packages/core/solidity/src/utils/convert-strings.ts
+++ b/packages/core/solidity/src/utils/convert-strings.ts
@@ -5,10 +5,10 @@ export const UINT256_MAX = BigInt(2) ** BigInt(256) - BigInt(1);
 /**
  * Checks that a string is a valid `uint256` value and converts it to bigint.
  *
- * @param value The value to check.
- * @param field The field name to use in the error if the value is invalid.
+ * @param value The string value to check and convert.
+ * @param field The field name to use in the error message if the value is invalid.
  * @throws OptionsError if the value is not a valid number or is greater than the maximum value for `uint256`.
- * @returns The value as a bigint.
+ * @returns The validated value as a bigint.
  */
 export function toUint256(value: string, field: string): bigint {
   const isValidNumber = /^\d+$/.test(value);