diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
index 2d90da9333..80830bc363 100644
--- a/crates/solidity/inputs/language/src/definition.rs
+++ b/crates/solidity/inputs/language/src/definition.rs
@@ -6920,6 +6920,12 @@ codegen_language_macros::compile!(Language(
             functions = [],
             enabled = From("0.6.2")
         ),
+        BuiltInType(
+            name = "Error",
+            fields = [BuiltInField(definition = "string reason")],
+            functions = [],
+            enabled = From("0.6.0")
+        ),
         BuiltInType(
             name = "$ErrorType",
             fields = [BuiltInField(definition = "bytes4 selector")],
@@ -6980,6 +6986,12 @@ codegen_language_macros::compile!(Language(
             ],
             functions = []
         ),
+        BuiltInType(
+            name = "Panic",
+            fields = [BuiltInField(definition = "uint errorCode")],
+            functions = [],
+            enabled = From("0.6.0")
+        ),
         BuiltInType(
             name = "$StringType",
             fields = [],
@@ -7062,14 +7074,6 @@ codegen_language_macros::compile!(Language(
         BuiltInVariable(definition = "$MessageType msg"),
         BuiltInVariable(definition = "uint now", enabled = Till("0.7.0")),
         BuiltInVariable(definition = "$StringType $string"),
-        BuiltInVariable(definition = "$TransactionType tx"),
-        BuiltInVariable(
-            definition = "error Error(string memory reason)",
-            enabled = From("0.6.0")
-        ),
-        BuiltInVariable(
-            definition = "error Panic(uint errorCode)",
-            enabled = From("0.6.0")
-        )
+        BuiltInVariable(definition = "$TransactionType tx")
     ]
 ));
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
index 45c6e5ed19..cd27030b12 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.0.sol
@@ -57,6 +57,9 @@ contract $BuiltIns$ {
   struct $BytesType {
     function(bytes[] bytesToConcatenate) returns (bytes memory) concat;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
     function(uint amount) returns (function()) gas;
     function(uint amount) returns (function()) value;
@@ -72,6 +75,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -102,6 +108,4 @@ contract $BuiltIns$ {
   uint now;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
index a0bb446211..8bba63d2df 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.2.sol
@@ -62,6 +62,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
     function(uint amount) returns (function()) gas;
     function(uint amount) returns (function()) value;
@@ -77,6 +80,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -107,6 +113,4 @@ contract $BuiltIns$ {
   uint now;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
index e52e8bc568..73c8732e8d 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.7.sol
@@ -62,6 +62,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
     function(uint amount) returns (function()) gas;
     function(uint amount) returns (function()) value;
@@ -77,6 +80,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -109,6 +115,4 @@ contract $BuiltIns$ {
   uint now;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
index 2b04543249..4e2c9b3802 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.6.8.sol
@@ -62,6 +62,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
     function(uint amount) returns (function()) gas;
     function(uint amount) returns (function()) value;
@@ -77,6 +80,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -111,6 +117,4 @@ contract $BuiltIns$ {
   uint now;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
index 7a32b13929..fe1b3e5d27 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.7.0.sol
@@ -62,6 +62,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
   }
   struct $ExternalFunction {
@@ -73,6 +76,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -106,6 +112,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
index c0458f66cd..c497a9bc17 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.0.sol
@@ -60,6 +60,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
   }
   struct $ExternalFunction {
@@ -71,6 +74,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -104,6 +110,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
index d5d39d7685..2924fa5d0f 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.11.sol
@@ -62,6 +62,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -77,6 +80,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -114,6 +120,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
index abc091e1d8..a9a2bced7a 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.18.sol
@@ -63,6 +63,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -78,6 +81,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -115,6 +121,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
index e768ffd939..3a753bda51 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.2.sol
@@ -60,6 +60,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $Function {
   }
   struct $ExternalFunction {
@@ -72,6 +75,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -105,6 +111,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
index 2add814926..398f185000 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.24.sol
@@ -65,6 +65,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -80,6 +83,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -117,6 +123,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
index 6a724e1c72..4b3e9ac0db 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.26.sol
@@ -66,6 +66,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -81,6 +84,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -118,6 +124,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
index cb0b6556fa..a1869696e1 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.4.sol
@@ -60,6 +60,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -75,6 +78,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -108,6 +114,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
index 0b2cb3537d..eb32310320 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.7.sol
@@ -61,6 +61,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -76,6 +79,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -109,6 +115,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }
diff --git a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
index 907d3f1b8c..aadc2f08ae 100644
--- a/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
+++ b/crates/solidity/outputs/cargo/crate/src/generated/bindings/generated/built_ins/0.8.8.sol
@@ -61,6 +61,9 @@ contract $BuiltIns$ {
     uint salt;
     uint value;
   }
+  struct Error {
+    string reason;
+  }
   struct $ErrorType {
     bytes4 selector;
   }
@@ -76,6 +79,9 @@ contract $BuiltIns$ {
     bytes4 sig;
     uint value;
   }
+  struct Panic {
+    uint errorCode;
+  }
   struct $StringType {
     function(string[] stringsToConcatenate) returns (string memory) concat;
   }
@@ -113,6 +119,4 @@ contract $BuiltIns$ {
   $MessageType msg;
   $StringType $string;
   $TransactionType tx;
-  error Error(string memory reason);
-  error Panic(uint errorCode);
 }