diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/AccountSnapshot.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/AccountSnapshot.java
index 2962e79f18..29d911ac63 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/AccountSnapshot.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/AccountSnapshot.java
@@ -47,7 +47,7 @@ public class AccountSnapshot {
   private boolean deploymentStatus;
 
   // TODO: is there a "canonical" way to take a snapshot fo an account
-  //  where getWorldUpdater().getAccount(address) return null ?
+  //  where getWorldUpdater().get(address) return null ?
 
   /**
    * Canonical way of creating an account snapshot.
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/romlex/RomLex.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/romlex/RomLex.java
index fafcd5a562..0e8e157cbf 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/romlex/RomLex.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/romlex/RomLex.java
@@ -219,8 +219,8 @@ public void callRomLex(final MessageFrame frame) {
             !hub.deploymentStatusOf(foreignCodeAddress),
             "EXTCODECOPY should only trigger a ROM_LEX chunk if its target isn't currently deploying");
         checkArgument(
-            !frame.getWorldUpdater().getAccount(foreignCodeAddress).isEmpty()
-                && frame.getWorldUpdater().getAccount(foreignCodeAddress).hasCode());
+            !frame.getWorldUpdater().get(foreignCodeAddress).isEmpty()
+                && frame.getWorldUpdater().get(foreignCodeAddress).hasCode());
 
         Optional.ofNullable(frame.getWorldUpdater().get(foreignCodeAddress))
             .map(AccountState::getCode)
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/SStore.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/SStore.java
index 039c329a02..a7fcc79538 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/SStore.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/opcode/gas/projector/SStore.java
@@ -31,7 +31,7 @@ public SStore(MessageFrame frame) {
     this.frame = frame;
     if (frame.stackSize() > 1) {
       this.key = UInt256.fromBytes(frame.getStackItem(0));
-      final Account account = frame.getWorldUpdater().getAccount(frame.getRecipientAddress());
+      final Account account = frame.getWorldUpdater().get(frame.getRecipientAddress());
       if (account == null) {
         return;
       }
diff --git a/testing/src/main/java/net/consensys/linea/testing/ToyWorld.java b/testing/src/main/java/net/consensys/linea/testing/ToyWorld.java
index acb652c7f3..41c3f2008e 100644
--- a/testing/src/main/java/net/consensys/linea/testing/ToyWorld.java
+++ b/testing/src/main/java/net/consensys/linea/testing/ToyWorld.java
@@ -135,7 +135,7 @@ public MutableAccount getAccount(final Address address) {
     if (addressAccountMap.containsKey(address)) {
       return addressAccountMap.get(address);
     } else if (parent != null) {
-      Account parentAccount = parent.getAccount(address);
+      Account parentAccount = parent.get(address);
       if (parentAccount == null) {
         return null;
       } else {