diff --git a/lib/evmone/baseline.cpp b/lib/evmone/baseline.cpp
index 88939a6e57..9af9e867f5 100644
--- a/lib/evmone/baseline.cpp
+++ b/lib/evmone/baseline.cpp
@@ -368,7 +368,7 @@ evmc_result execute(const VM& vm, ExecutionState& state, const CodeAnalysis& ana
 evmc_result execute(evmc_vm* c_vm, const evmc_host_interface* host, evmc_host_context* ctx,
     evmc_revision rev, const evmc_message* msg, const uint8_t* code, size_t code_size) noexcept
 {
-    if (rev >= EVMC_CANCUN && is_eof_code({code, code_size}))
+    if (rev >= EVMC_CANCUN && is_eof_container({code, code_size}))
     {
         // TODO(EOF): The initcode must be validated. Doing this just before execution is
         //   good because validation can be combined with analysis/loading. But consider also
diff --git a/lib/evmone/instructions_calls.cpp b/lib/evmone/instructions_calls.cpp
index fa5a33c313..845facd4cc 100644
--- a/lib/evmone/instructions_calls.cpp
+++ b/lib/evmone/instructions_calls.cpp
@@ -166,8 +166,8 @@ evmc_status_code create_impl(StackTop stack, ExecutionState& state) noexcept
         msg.input_size = init_code_size;
     }
 
-    if (state.rev >= EVMC_CANCUN &&
-        (is_eof_code(state.original_code) || is_eof_code({msg.input_data, msg.input_size})))
+    if (state.rev >= EVMC_CANCUN && (is_eof_container(state.original_code) ||
+                                        is_eof_container({msg.input_data, msg.input_size})))
         if (validate_eof(state.rev, {msg.input_data, msg.input_size}) !=
             EOFValidationError::success)
             return EVMC_SUCCESS;
diff --git a/test/state/state.cpp b/test/state/state.cpp
index 4ecace6017..e09495a3a1 100644
--- a/test/state/state.cpp
+++ b/test/state/state.cpp
@@ -166,7 +166,7 @@ std::variant<TransactionReceipt, std::error_code> transition(
     auto is_valid_tx = true;
     auto result = evmc::Result{};
 
-    if (rev >= EVMC_CANCUN && !tx.to.has_value() && is_eof_code(tx.data))
+    if (rev >= EVMC_CANCUN && !tx.to.has_value() && is_eof_container(tx.data))
         is_valid_tx = (validate_eof(rev, tx.data) == evmone::EOFValidationError::success);
 
     if (is_valid_tx)