diff --git a/crates/ir/src/inst/evm/inst_set.rs b/crates/ir/src/inst/evm/inst_set.rs
index 58b9f893..a230c9c7 100644
--- a/crates/ir/src/inst/evm/inst_set.rs
+++ b/crates/ir/src/inst/evm/inst_set.rs
@@ -60,9 +60,9 @@ pub struct EvmInstSet(
     evm::EvmOrigin,
     evm::EvmCaller,
     evm::EvmCallValue,
-    evm::EvmCallDataLoad,
-    evm::EvmCallDataCopy,
-    evm::EvmCallDataSize,
+    evm::EvmCalldataLoad,
+    evm::EvmCalldataCopy,
+    evm::EvmCalldataSize,
     evm::EvmCodeSize,
     evm::EvmCodeCopy,
     evm::EvmExtCodeCopy,
diff --git a/crates/ir/src/inst/evm/mod.rs b/crates/ir/src/inst/evm/mod.rs
index d42af28e..806654c4 100644
--- a/crates/ir/src/inst/evm/mod.rs
+++ b/crates/ir/src/inst/evm/mod.rs
@@ -114,17 +114,18 @@ pub struct EvmCallValue {}
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
 #[inst(side_effect(crate::inst::SideEffect::Read))]
-pub struct EvmCallDataLoad {
+pub struct EvmCalldataLoad {
+    #[inst(value)]
     data_offset: ValueId,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
 #[inst(side_effect(crate::inst::SideEffect::Read))]
-pub struct EvmCallDataSize {}
+pub struct EvmCalldataSize {}
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
 #[inst(side_effect(crate::inst::SideEffect::Write))]
-pub struct EvmCallDataCopy {
+pub struct EvmCalldataCopy {
     #[inst(value)]
     dst_addr: ValueId,
     #[inst(value)]
diff --git a/crates/ir/src/inst/inst_set.rs b/crates/ir/src/inst/inst_set.rs
index e2cec8b8..e5ee79c4 100644
--- a/crates/ir/src/inst/inst_set.rs
+++ b/crates/ir/src/inst/inst_set.rs
@@ -75,9 +75,9 @@ define_inst_set_base! {
         evm::EvmOrigin,
         evm::EvmCaller,
         evm::EvmCallValue,
-        evm::EvmCallDataLoad,
-        evm::EvmCallDataCopy,
-        evm::EvmCallDataSize,
+        evm::EvmCalldataLoad,
+        evm::EvmCalldataCopy,
+        evm::EvmCalldataSize,
         evm::EvmCodeSize,
         evm::EvmCodeCopy,
         evm::EvmGasPrice,
diff --git a/crates/parser/src/inst/evm/mod.rs b/crates/parser/src/inst/evm/mod.rs
index 75585381..8b27dc69 100644
--- a/crates/parser/src/inst/evm/mod.rs
+++ b/crates/parser/src/inst/evm/mod.rs
@@ -16,9 +16,9 @@ super::impl_inst_build! {EvmBalance, (contract_addr: ValueId)}
 super::impl_inst_build! {EvmOrigin, ()}
 super::impl_inst_build! {EvmCaller, ()}
 super::impl_inst_build! {EvmCallValue, ()}
-super::impl_inst_build! {EvmCallDataLoad, (data_offset: ValueId)}
-super::impl_inst_build! {EvmCallDataCopy, (dst_addr: ValueId, data_offset: ValueId, len: ValueId)}
-super::impl_inst_build! {EvmCallDataSize, ()}
+super::impl_inst_build! {EvmCalldataLoad, (data_offset: ValueId)}
+super::impl_inst_build! {EvmCalldataCopy, (dst_addr: ValueId, data_offset: ValueId, len: ValueId)}
+super::impl_inst_build! {EvmCalldataSize, ()}
 super::impl_inst_build! {EvmCodeSize, ()}
 super::impl_inst_build! {EvmCodeCopy, (dst_addr: ValueId, code_offset: ValueId, len: ValueId)}
 super::impl_inst_build! {EvmGasPrice, ()}