diff --git a/compiler_tester/src/vm/eravm/system_contracts.rs b/compiler_tester/src/vm/eravm/system_contracts.rs
index e9a8a2fb..2998ac73 100644
--- a/compiler_tester/src/vm/eravm/system_contracts.rs
+++ b/compiler_tester/src/vm/eravm/system_contracts.rs
@@ -133,8 +133,8 @@ impl SystemContracts {
 
     /// The base token system contract implementation path.
     const PATH_BASE_TOKEN: (&'static str, &'static str) = (
-        "era-contracts/system-contracts/contracts/BaseToken.sol",
-        "BaseToken",
+        "era-contracts/system-contracts/contracts/L2BaseToken.sol",
+        "L2BaseToken",
     );
 
     /// The EVM gas manager system contract implementation path.
diff --git a/era-contracts b/era-contracts
index ed6f4d1f..daba783e 160000
--- a/era-contracts
+++ b/era-contracts
@@ -1 +1 @@
-Subproject commit ed6f4d1f8fcde854e084cd1d237fd80698f2da19
+Subproject commit daba783e8ee9ad578a69a1a15716b5fd3680a5bd
diff --git a/solidity b/solidity
index 71988f75..7893614a 160000
--- a/solidity
+++ b/solidity
@@ -1 +1 @@
-Subproject commit 71988f7546063a9d6d63d54ece85839400b46264
+Subproject commit 7893614a31fbeacd1966994e310ed4f760772658