Repository: ethereum/consensus-specs

Issue:
Rename EIP-4844 specs to Deneb 🦢
[Deneb](https://en.wikipedia.org/wiki/Deneb) was chosen to be the code name after Capella (https://github.com/ethereum/pm/issues/702) 🎉

We will make renaming in early February. 
- [x] Move `eip4844` folder to `deneb`.
- [ ] Rename and fix links.




Discussion:

Resolving patch:
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ def installPackage(package: str):
 ALTAIR = 'altair'
 BELLATRIX = 'bellatrix'
 CAPELLA = 'capella'
-EIP4844 = 'eip4844'
+DENEB = 'deneb'
 
 
 # The helper functions that are used when defining constants
@@ -632,10 +632,10 @@ def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
         return {**super().hardcoded_ssz_dep_constants(), **constants}
 
 #
-# EIP4844SpecBuilder
+# DenebSpecBuilder
 #
-class EIP4844SpecBuilder(CapellaSpecBuilder):
-    fork: str = EIP4844
+class DenebSpecBuilder(CapellaSpecBuilder):
+    fork: str = DENEB
 
     @classmethod
     def imports(cls, preset_name: str):
@@ -653,9 +653,9 @@ def preparations(cls):
     @classmethod
     def sundry_functions(cls) -> str:
         return super().sundry_functions() + '\n\n' + '''
-def retrieve_blobs_sidecar(slot: Slot, beacon_block_root: Root) -> PyUnion[BlobsSidecar, str]:
+def retrieve_blobs_and_proofs(beacon_block_root: Root) -> PyUnion[Tuple[Blob, KZGProof], Tuple[str, str]]:
     # pylint: disable=unused-argument
-    return "TEST"'''
+    return ("TEST", "TEST")'''
 
     @classmethod
     def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
@@ -669,7 +669,7 @@ def hardcoded_custom_type_dep_constants(cls, spec_object) -> str:
 
 spec_builders = {
     builder.fork: builder
-    for builder in (Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, EIP4844SpecBuilder)
+    for builder in (Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder)
 }
 
 
@@ -968,14 +968,14 @@ def finalize_options(self):
         if len(self.md_doc_paths) == 0:
             print("no paths were specified, using default markdown file paths for pyspec"
                   " build (spec fork: %s)" % self.spec_fork)
-            if self.spec_fork in (PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844):
+            if self.spec_fork in (PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB):
                 self.md_doc_paths = """
                     specs/phase0/beacon-chain.md
                     specs/phase0/fork-choice.md
                     specs/phase0/validator.md
                     specs/phase0/weak-subjectivity.md
                 """
-            if self.spec_fork in (ALTAIR, BELLATRIX, CAPELLA, EIP4844):
+            if self.spec_fork in (ALTAIR, BELLATRIX, CAPELLA, DENEB):
                 self.md_doc_paths += """
                     specs/altair/light-client/full-node.md
                     specs/altair/light-client/light-client.md
@@ -987,7 +987,7 @@ def finalize_options(self):
                     specs/altair/validator.md
                     specs/altair/p2p-interface.md
                 """
-            if self.spec_fork in (BELLATRIX, CAPELLA, EIP4844):
+            if self.spec_fork in (BELLATRIX, CAPELLA, DENEB):
                 self.md_doc_paths += """
                     specs/bellatrix/beacon-chain.md
                     specs/bellatrix/fork.md
@@ -996,7 +996,7 @@ def finalize_options(self):
                     specs/bellatrix/p2p-interface.md
                     sync/optimistic.md
                 """
-            if self.spec_fork in (CAPELLA, EIP4844):
+            if self.spec_fork in (CAPELLA, DENEB):
                 self.md_doc_paths += """
                     specs/capella/light-client/fork.md
                     specs/capella/light-client/full-node.md
@@ -1008,18 +1008,18 @@ def finalize_options(self):
                     specs/capella/validator.md
                     specs/capella/p2p-interface.md
                 """
-            if self.spec_fork == EIP4844:
+            if self.spec_fork == DENEB:
                 self.md_doc_paths += """
-                    specs/eip4844/light-client/fork.md
-                    specs/eip4844/light-client/full-node.md
-                    specs/eip4844/light-client/p2p-interface.md
-                    specs/eip4844/light-client/sync-protocol.md
-                    specs/eip4844/beacon-chain.md
-                    specs/eip4844/fork.md
-                    specs/eip4844/fork-choice.md
-                    specs/eip4844/polynomial-commitments.md
-                    specs/eip4844/p2p-interface.md
-                    specs/eip4844/validator.md
+                    specs/deneb/light-client/fork.md
+                    specs/deneb/light-client/full-node.md
+                    specs/deneb/light-client/p2p-interface.md
+                    specs/deneb/light-client/sync-protocol.md
+                    specs/deneb/beacon-chain.md
+                    specs/deneb/fork.md
+                    specs/deneb/fork-choice.md
+                    specs/deneb/polynomial-commitments.md
+                    specs/deneb/p2p-interface.md
+                    specs/deneb/validator.md
                 """
             if len(self.md_doc_paths) == 0:
                 raise Exception('no markdown files specified, and spec fork "%s" is unknown', self.spec_fork)
@@ -1169,7 +1169,7 @@ def run(self):
         "pycryptodome==3.15.0",
         "py_ecc==6.0.0",
         "milagro_bls_binding==1.9.0",
-        "remerkleable==0.1.25",
+        "remerkleable==0.1.27",
         "trie==2.0.2",
         RUAMEL_YAML_VERSION,
         "lru-dict==1.1.8",


Test patch:
diff --git a/tests/core/pyspec/eth2spec/VERSION.txt b/tests/core/pyspec/eth2spec/VERSION.txt
--- a/tests/core/pyspec/eth2spec/VERSION.txt
+++ b/tests/core/pyspec/eth2spec/VERSION.txt
@@ -1 +1 @@
-1.3.0-rc.2
+1.3.0-rc.3
diff --git a/tests/core/pyspec/eth2spec/test/altair/light_client/test_sync.py b/tests/core/pyspec/eth2spec/test/altair/light_client/test_sync.py
--- a/tests/core/pyspec/eth2spec/test/altair/light_client/test_sync.py
+++ b/tests/core/pyspec/eth2spec/test/altair/light_client/test_sync.py
@@ -16,7 +16,7 @@
     state_transition_with_full_block,
 )
 from eth2spec.test.helpers.constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB,
     MINIMAL,
     ALL_PHASES,
 )
@@ -24,7 +24,7 @@
     do_fork,
 )
 from eth2spec.test.helpers.forks import (
-    is_post_capella, is_post_eip4844,
+    is_post_capella, is_post_deneb,
     is_post_fork,
 )
 from eth2spec.test.helpers.light_client import (
@@ -53,8 +53,8 @@ def needs_upgrade_to_capella(d_spec, s_spec):
     return is_post_capella(s_spec) and not is_post_capella(d_spec)
 
 
-def needs_upgrade_to_eip4844(d_spec, s_spec):
-    return is_post_eip4844(s_spec) and not is_post_eip4844(d_spec)
+def needs_upgrade_to_deneb(d_spec, s_spec):
+    return is_post_deneb(s_spec) and not is_post_deneb(d_spec)
 
 
 def check_lc_header_equal(d_spec, s_spec, data, upgraded):
@@ -80,8 +80,8 @@ def upgrade_lc_bootstrap_to_store(d_spec, s_spec, data):
         upgraded = s_spec.upgrade_lc_bootstrap_to_capella(upgraded)
         check_lc_bootstrap_equal(d_spec, s_spec, data, upgraded)
 
-    if needs_upgrade_to_eip4844(d_spec, s_spec):
-        upgraded = s_spec.upgrade_lc_bootstrap_to_eip4844(upgraded)
+    if needs_upgrade_to_deneb(d_spec, s_spec):
+        upgraded = s_spec.upgrade_lc_bootstrap_to_deneb(upgraded)
         check_lc_bootstrap_equal(d_spec, s_spec, data, upgraded)
 
     return upgraded
@@ -103,8 +103,8 @@ def upgrade_lc_update_to_store(d_spec, s_spec, data):
         upgraded = s_spec.upgrade_lc_update_to_capella(upgraded)
         check_lc_update_equal(d_spec, s_spec, data, upgraded)
 
-    if needs_upgrade_to_eip4844(d_spec, s_spec):
-        upgraded = s_spec.upgrade_lc_update_to_eip4844(upgraded)
+    if needs_upgrade_to_deneb(d_spec, s_spec):
+        upgraded = s_spec.upgrade_lc_update_to_deneb(upgraded)
         check_lc_update_equal(d_spec, s_spec, data, upgraded)
 
     return upgraded
@@ -130,8 +130,8 @@ def upgrade_lc_store_to_new_spec(d_spec, s_spec, data):
         upgraded = s_spec.upgrade_lc_store_to_capella(upgraded)
         check_lc_store_equal(d_spec, s_spec, data, upgraded)
 
-    if needs_upgrade_to_eip4844(d_spec, s_spec):
-        upgraded = s_spec.upgrade_lc_store_to_eip4844(upgraded)
+    if needs_upgrade_to_deneb(d_spec, s_spec):
+        upgraded = s_spec.upgrade_lc_store_to_deneb(upgraded)
         check_lc_store_equal(d_spec, s_spec, data, upgraded)
 
     return upgraded
@@ -145,8 +145,8 @@ class LightClientSyncTest(object):
 
 
 def get_store_fork_version(s_spec):
-    if is_post_eip4844(s_spec):
-        return s_spec.config.EIP4844_FORK_VERSION
+    if is_post_deneb(s_spec):
+        return s_spec.config.DENEB_FORK_VERSION
     if is_post_capella(s_spec):
         return s_spec.config.CAPELLA_FORK_VERSION
     return s_spec.config.ALTAIR_FORK_VERSION
@@ -731,16 +731,16 @@ def test_capella_fork(spec, phases, state):
     yield from run_test_single_fork(spec, phases, state, CAPELLA)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_config_overrides({
-    'EIP4844_FORK_EPOCH': 3,  # `setup_test` advances to epoch 2
+    'DENEB_FORK_EPOCH': 3,  # `setup_test` advances to epoch 2
 }, emit=False)
 @with_state
-@with_matching_spec_config(emitted_fork=EIP4844)
+@with_matching_spec_config(emitted_fork=DENEB)
 @with_presets([MINIMAL], reason="too slow")
-def test_eip4844_fork(spec, phases, state):
-    yield from run_test_single_fork(spec, phases, state, EIP4844)
+def test_deneb_fork(spec, phases, state):
+    yield from run_test_single_fork(spec, phases, state, DENEB)
 
 
 def run_test_multi_fork(spec, phases, state, fork_1, fork_2):
@@ -779,17 +779,17 @@ def run_test_multi_fork(spec, phases, state, fork_1, fork_2):
     yield from finish_test(test)
 
 
-@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA, EIP4844])
+@with_phases(phases=[BELLATRIX], other_phases=[CAPELLA, DENEB])
 @spec_test
 @with_config_overrides({
     'CAPELLA_FORK_EPOCH': 3,  # `setup_test` advances to epoch 2
-    'EIP4844_FORK_EPOCH': 4,
+    'DENEB_FORK_EPOCH': 4,
 }, emit=False)
 @with_state
-@with_matching_spec_config(emitted_fork=EIP4844)
+@with_matching_spec_config(emitted_fork=DENEB)
 @with_presets([MINIMAL], reason="too slow")
-def test_capella_eip4844_fork(spec, phases, state):
-    yield from run_test_multi_fork(spec, phases, state, CAPELLA, EIP4844)
+def test_capella_deneb_fork(spec, phases, state):
+    yield from run_test_multi_fork(spec, phases, state, CAPELLA, DENEB)
 
 
 def run_test_upgraded_store_with_legacy_data(spec, phases, state, fork):
@@ -823,10 +823,10 @@ def test_capella_store_with_legacy_data(spec, phases, state):
     yield from run_test_upgraded_store_with_legacy_data(spec, phases, state, CAPELLA)
 
 
-@with_phases(phases=[ALTAIR, BELLATRIX, CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[ALTAIR, BELLATRIX, CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_state
-@with_matching_spec_config(emitted_fork=EIP4844)
+@with_matching_spec_config(emitted_fork=DENEB)
 @with_presets([MINIMAL], reason="too slow")
-def test_eip4844_store_with_legacy_data(spec, phases, state):
-    yield from run_test_upgraded_store_with_legacy_data(spec, phases, state, EIP4844)
+def test_deneb_store_with_legacy_data(spec, phases, state):
+    yield from run_test_upgraded_store_with_legacy_data(spec, phases, state, DENEB)
diff --git a/tests/core/pyspec/eth2spec/test/capella/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/capella/sanity/test_blocks.py
--- a/tests/core/pyspec/eth2spec/test/capella/sanity/test_blocks.py
+++ b/tests/core/pyspec/eth2spec/test/capella/sanity/test_blocks.py
@@ -9,7 +9,6 @@
     next_epoch_via_block,
     state_transition_and_sign_block,
     transition_to,
-    transition_to_slot_via_block,
     next_slot,
 )
 from eth2spec.test.helpers.block import (
@@ -38,7 +37,7 @@
 
 @with_capella_and_later
 @spec_state_test
-def test_success_bls_change(spec, state):
+def test_bls_change(spec, state):
     index = 0
     signed_address_change = get_signed_address_change(spec, state, validator_index=index)
     pre_credentials = state.validators[index].withdrawal_credentials
@@ -61,7 +60,46 @@ def test_success_bls_change(spec, state):
 
 @with_capella_and_later
 @spec_state_test
-def test_success_exit_and_bls_change(spec, state):
+def test_deposit_and_bls_change(spec, state):
+    initial_registry_len = len(state.validators)
+    initial_balances_len = len(state.balances)
+
+    validator_index = len(state.validators)
+    amount = spec.MAX_EFFECTIVE_BALANCE
+    deposit = prepare_state_and_deposit(spec, state, validator_index, amount, signed=True)
+
+    signed_address_change = get_signed_address_change(
+        spec, state,
+        validator_index=validator_index,
+        withdrawal_pubkey=deposit.data.pubkey,  # Deposit helper defaults to use pubkey as withdrawal credential
+    )
+
+    deposit_credentials = deposit.data.withdrawal_credentials
+    assert deposit_credentials[:1] == spec.BLS_WITHDRAWAL_PREFIX
+
+    yield 'pre', state
+
+    block = build_empty_block_for_next_slot(spec, state)
+    block.body.deposits.append(deposit)
+    block.body.bls_to_execution_changes.append(signed_address_change)
+
+    signed_block = state_transition_and_sign_block(spec, state, block)
+
+    yield 'blocks', [signed_block]
+    yield 'post', state
+
+    assert len(state.validators) == initial_registry_len + 1
+    assert len(state.balances) == initial_balances_len + 1
+    validator_credentials = state.validators[validator_index].withdrawal_credentials
+    assert deposit_credentials != validator_credentials
+    assert validator_credentials[:1] == spec.ETH1_ADDRESS_WITHDRAWAL_PREFIX
+    assert validator_credentials[1:12] == b'\x00' * 11
+    assert validator_credentials[12:] == signed_address_change.message.to_execution_address
+
+
+@with_capella_and_later
+@spec_state_test
+def test_exit_and_bls_change(spec, state):
     # move state forward SHARD_COMMITTEE_PERIOD epochs to allow for exit
     state.slot += spec.config.SHARD_COMMITTEE_PERIOD * spec.SLOTS_PER_EPOCH
 
@@ -341,7 +379,8 @@ def test_top_up_to_fully_withdrawn_validator(spec, state):
     )
 
     # Apply an empty block
-    signed_block_2 = transition_to_slot_via_block(spec, state, state.slot + 1)
+    block = build_empty_block_for_next_slot(spec, state)
+    signed_block_2 = state_transition_and_sign_block(spec, state, block)
 
     # With mainnet preset, it holds
     if len(state.validators) <= spec.MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP:
@@ -387,7 +426,8 @@ def _run_activate_and_partial_withdrawal(spec, state, initial_balance):
 
     blocks = []
     # To activate
-    signed_block = transition_to_slot_via_block(spec, state, state.slot + 1)
+    block = build_empty_block_for_next_slot(spec, state)
+    signed_block = state_transition_and_sign_block(spec, state, block)
     blocks.append(signed_block)
 
     assert spec.is_active_validator(state.validators[validator_index], spec.get_current_epoch(state))
diff --git a/tests/core/pyspec/eth2spec/test/context.py b/tests/core/pyspec/eth2spec/test/context.py
--- a/tests/core/pyspec/eth2spec/test/context.py
+++ b/tests/core/pyspec/eth2spec/test/context.py
@@ -7,12 +7,12 @@
 from eth2spec.altair import mainnet as spec_altair_mainnet, minimal as spec_altair_minimal
 from eth2spec.bellatrix import mainnet as spec_bellatrix_mainnet, minimal as spec_bellatrix_minimal
 from eth2spec.capella import mainnet as spec_capella_mainnet, minimal as spec_capella_minimal
-from eth2spec.eip4844 import mainnet as spec_eip4844_mainnet, minimal as spec_eip4844_minimal
+from eth2spec.deneb import mainnet as spec_deneb_mainnet, minimal as spec_deneb_minimal
 from eth2spec.utils import bls
 
 from .exceptions import SkippedTest
 from .helpers.constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB,
     MINIMAL, MAINNET,
     ALL_PHASES,
     ALL_FORK_UPGRADES,
@@ -78,14 +78,14 @@ class ForkMeta:
         ALTAIR: spec_altair_minimal,
         BELLATRIX: spec_bellatrix_minimal,
         CAPELLA: spec_capella_minimal,
-        EIP4844: spec_eip4844_minimal,
+        DENEB: spec_deneb_minimal,
     },
     MAINNET: {
         PHASE0: spec_phase0_mainnet,
         ALTAIR: spec_altair_mainnet,
         BELLATRIX: spec_bellatrix_mainnet,
         CAPELLA: spec_capella_mainnet,
-        EIP4844: spec_eip4844_mainnet
+        DENEB: spec_deneb_mainnet
     },
 }
 
@@ -427,7 +427,7 @@ def decorator(fn):
 with_altair_and_later = with_all_phases_from(ALTAIR)
 with_bellatrix_and_later = with_all_phases_from(BELLATRIX)
 with_capella_and_later = with_all_phases_from(CAPELLA)
-with_eip4844_and_later = with_all_phases_from(EIP4844)
+with_deneb_and_later = with_all_phases_from(DENEB)
 
 
 def _get_preset_targets(kw):
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/fork/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/fork/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/fork/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/fork/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py b/tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_basic.py
similarity index 55%
rename from tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py
rename to tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_basic.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_basic.py
@@ -7,76 +7,76 @@
 )
 from eth2spec.test.utils import with_meta_tags
 from eth2spec.test.helpers.constants import (
-    CAPELLA, EIP4844,
+    CAPELLA, DENEB,
     MINIMAL,
 )
 from eth2spec.test.helpers.state import (
     next_epoch,
     next_epoch_via_block,
 )
-from eth2spec.test.helpers.eip4844.fork import (
-    EIP4844_FORK_TEST_META_TAGS,
+from eth2spec.test.helpers.deneb.fork import (
+    DENEB_FORK_TEST_META_TAGS,
     run_fork_test,
 )
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_base_state(spec, phases, state):
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_next_epoch(spec, phases, state):
     next_epoch(spec, state)
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_next_epoch_with_block(spec, phases, state):
     next_epoch_via_block(spec, state)
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @spec_test
 @with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_many_next_epoch(spec, phases, state):
     for _ in range(3):
         next_epoch(spec, state)
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @spec_test
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_random_low_balances(spec, phases, state):
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @spec_test
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_random_misc_balances(spec, phases, state):
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
 
 
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
 @with_presets([MINIMAL],
               reason="mainnet config leads to larger validator set than limit of public/private keys pre-generated")
 @with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
 @spec_test
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
 def test_fork_random_large_validator_set(spec, phases, state):
-    yield from run_fork_test(phases[EIP4844], state)
+    yield from run_fork_test(phases[DENEB], state)
diff --git a/tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_random.py b/tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_random.py
new file mode 100644
--- /dev/null
+++ b/tests/core/pyspec/eth2spec/test/deneb/fork/test_deneb_fork_random.py
@@ -0,0 +1,84 @@
+from random import Random
+
+from eth2spec.test.context import (
+    with_phases,
+    with_custom_state,
+    with_presets,
+    spec_test, with_state,
+    low_balances, misc_balances, large_validator_set,
+)
+from eth2spec.test.utils import with_meta_tags
+from eth2spec.test.helpers.constants import (
+    CAPELLA, DENEB,
+    MINIMAL,
+)
+from eth2spec.test.helpers.deneb.fork import (
+    DENEB_FORK_TEST_META_TAGS,
+    run_fork_test,
+)
+from eth2spec.test.helpers.random import randomize_state
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_state
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_0(spec, phases, state):
+    randomize_state(spec, state, rng=Random(1010))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_state
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_1(spec, phases, state):
+    randomize_state(spec, state, rng=Random(2020))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_state
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_2(spec, phases, state):
+    randomize_state(spec, state, rng=Random(3030))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_state
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_3(spec, phases, state):
+    randomize_state(spec, state, rng=Random(4040))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_low_balances(spec, phases, state):
+    randomize_state(spec, state, rng=Random(5050))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@spec_test
+@with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_misc_balances(spec, phases, state):
+    randomize_state(spec, state, rng=Random(6060))
+    yield from run_fork_test(phases[DENEB], state)
+
+
+@with_phases(phases=[CAPELLA], other_phases=[DENEB])
+@with_presets([MINIMAL],
+              reason="mainnet config leads to larger validator set than limit of public/private keys pre-generated")
+@spec_test
+@with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
+@with_meta_tags(DENEB_FORK_TEST_META_TAGS)
+def test_deneb_fork_random_large_validator_set(spec, phases, state):
+    randomize_state(spec, state, rng=Random(7070))
+    yield from run_fork_test(phases[DENEB], state)
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/random/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/random/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/random/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/random/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/random/test_random.py b/tests/core/pyspec/eth2spec/test/deneb/random/test_random.py
similarity index 63%
rename from tests/core/pyspec/eth2spec/test/eip4844/random/test_random.py
rename to tests/core/pyspec/eth2spec/test/deneb/random/test_random.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/random/test_random.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/random/test_random.py
@@ -4,7 +4,7 @@
 See the README for that generator for more information.
 """
 
-from eth2spec.test.helpers.constants import EIP4844
+from eth2spec.test.helpers.constants import DENEB
 from eth2spec.test.context import (
     misc_balances_in_default_range_with_many_validators,
     with_phases,
@@ -23,7 +23,7 @@
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -36,11 +36,11 @@ def test_randomized_0(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -49,7 +49,7 @@ def test_randomized_0(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -62,11 +62,11 @@ def test_randomized_1(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -75,7 +75,7 @@ def test_randomized_1(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -88,11 +88,11 @@ def test_randomized_2(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -101,7 +101,7 @@ def test_randomized_2(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -114,11 +114,11 @@ def test_randomized_3(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -127,7 +127,7 @@ def test_randomized_3(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -140,11 +140,11 @@ def test_randomized_4(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -153,7 +153,7 @@ def test_randomized_4(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -166,11 +166,11 @@ def test_randomized_5(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -179,7 +179,7 @@ def test_randomized_5(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -192,11 +192,11 @@ def test_randomized_6(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -205,7 +205,7 @@ def test_randomized_6(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -218,11 +218,11 @@ def test_randomized_7(spec, state):
     # epochs:0,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'validation': 'validate_is_not_leaking', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -231,7 +231,7 @@ def test_randomized_7(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -244,11 +244,11 @@ def test_randomized_8(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -257,7 +257,7 @@ def test_randomized_8(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -270,11 +270,11 @@ def test_randomized_9(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -283,7 +283,7 @@ def test_randomized_9(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -296,11 +296,11 @@ def test_randomized_10(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -309,7 +309,7 @@ def test_randomized_10(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -322,11 +322,11 @@ def test_randomized_11(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -335,7 +335,7 @@ def test_randomized_11(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -348,11 +348,11 @@ def test_randomized_12(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:last_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'last_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -361,7 +361,7 @@ def test_randomized_12(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -374,11 +374,11 @@ def test_randomized_13(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:random_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'random_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -387,7 +387,7 @@ def test_randomized_13(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -400,11 +400,11 @@ def test_randomized_14(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:0,slots:0,with-block:no_block
     # epochs:0,slots:penultimate_slot_in_epoch,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 0, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 'penultimate_slot_in_epoch', 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
@@ -413,7 +413,7 @@ def test_randomized_14(spec, state):
 
 
 @only_generator("randomized test for broad coverage, not point-to-point CI")
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @with_custom_state(
     balances_fn=misc_balances_in_default_range_with_many_validators,
     threshold_fn=zero_activation_threshold
@@ -426,11 +426,11 @@ def test_randomized_15(spec, state):
     # epochs:epochs_until_leak,slots:0,with-block:no_block
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
+    # epochs:0,slots:0,with-block:random_block_deneb
     # epochs:1,slots:0,with-block:no_block
     # epochs:0,slots:0,with-block:no_block
-    # epochs:0,slots:0,with-block:random_block_eip4844
-    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_eip4844', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_eip4844'}  # noqa: E501
+    # epochs:0,slots:0,with-block:random_block_deneb
+    scenario = {'transitions': [{'epochs_to_skip': 'epochs_until_leak', 'validation': 'validate_is_leaking', 'slots_to_skip': 0, 'block_producer': 'no_block'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}, {'epochs_to_skip': 1, 'slots_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'slots_to_skip': 0, 'epochs_to_skip': 0, 'block_producer': 'no_block', 'validation': 'no_op_validation'}, {'block_producer': 'random_block_deneb', 'epochs_to_skip': 0, 'slots_to_skip': 0, 'validation': 'no_op_validation'}], 'state_randomizer': 'randomize_state_deneb'}  # noqa: E501
     yield from run_generated_randomized_test(
         spec,
         state,
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/sanity/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/sanity/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/sanity/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/sanity/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/deneb/sanity/test_blocks.py
similarity index 95%
rename from tests/core/pyspec/eth2spec/test/eip4844/sanity/test_blocks.py
rename to tests/core/pyspec/eth2spec/test/deneb/sanity/test_blocks.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/sanity/test_blocks.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/sanity/test_blocks.py
@@ -6,7 +6,7 @@
 )
 from eth2spec.test.context import (
     spec_state_test,
-    with_eip4844_and_later,
+    with_deneb_and_later,
 )
 from eth2spec.test.helpers.execution_payload import (
     compute_el_block_hash,
@@ -16,7 +16,7 @@
 )
 
 
-@with_eip4844_and_later
+@with_deneb_and_later
 @spec_state_test
 def test_one_blob(spec, state):
     yield 'pre', state
@@ -32,7 +32,7 @@ def test_one_blob(spec, state):
     yield 'post', state
 
 
-@with_eip4844_and_later
+@with_deneb_and_later
 @spec_state_test
 def test_max_blobs(spec, state):
     yield 'pre', state
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/transition/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/transition/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/transition/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/transition/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/transition/test_operations.py b/tests/core/pyspec/eth2spec/test/deneb/transition/test_operations.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/transition/test_operations.py
rename to tests/core/pyspec/eth2spec/test/deneb/transition/test_operations.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/fork_choice/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/fork_choice/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/deneb/unittests/fork_choice/test_validate_blobs.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/fork_choice/test_validate_blobs.py
new file mode 100644
--- /dev/null
+++ b/tests/core/pyspec/eth2spec/test/deneb/unittests/fork_choice/test_validate_blobs.py
@@ -0,0 +1,55 @@
+from eth2spec.test.helpers.state import (
+    state_transition_and_sign_block,
+)
+from eth2spec.test.helpers.block import (
+    build_empty_block_for_next_slot
+)
+from eth2spec.test.context import (
+    spec_state_test,
+    with_deneb_and_later,
+)
+from eth2spec.test.helpers.execution_payload import (
+    compute_el_block_hash,
+)
+from eth2spec.test.helpers.sharding import (
+    get_sample_opaque_tx,
+)
+
+
+def _run_validate_blobs(spec, state, blob_count):
+    block = build_empty_block_for_next_slot(spec, state)
+    opaque_tx, blobs, blob_kzg_commitments = get_sample_opaque_tx(spec, blob_count=blob_count)
+    block.body.blob_kzg_commitments = blob_kzg_commitments
+    block.body.execution_payload.transactions = [opaque_tx]
+    block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
+    state_transition_and_sign_block(spec, state, block)
+
+    # Also test the proof generation in `get_blob_sidecars`
+    blob_sidecars = spec.get_blob_sidecars(block, blobs)
+    blobs = [sidecar.blob for sidecar in blob_sidecars]
+    kzg_proofs = [sidecar.kzg_proof for sidecar in blob_sidecars]
+    spec.validate_blobs(blob_kzg_commitments, blobs, kzg_proofs)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_validate_blobs_zero_blobs(spec, state):
+    _run_validate_blobs(spec, state, blob_count=0)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_validate_blobs_one_blob(spec, state):
+    _run_validate_blobs(spec, state, blob_count=1)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_validate_blobs_two_blobs(spec, state):
+    _run_validate_blobs(spec, state, blob_count=2)
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_validate_blobs_max_blobs(spec, state):
+    _run_validate_blobs(spec, state, blob_count=spec.MAX_BLOBS_PER_BLOCK)
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/__init__.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/polynomial_commitments/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/__init__.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/polynomial_commitments/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/test_polynomial_commitments.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/polynomial_commitments/test_polynomial_commitments.py
similarity index 79%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/test_polynomial_commitments.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/polynomial_commitments/test_polynomial_commitments.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/test_polynomial_commitments.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/unittests/polynomial_commitments/test_polynomial_commitments.py
@@ -2,7 +2,7 @@
 
 from eth2spec.test.context import (
     spec_state_test,
-    with_eip4844_and_later,
+    with_deneb_and_later,
 )
 from eth2spec.test.helpers.sharding import (
     get_sample_blob,
@@ -11,7 +11,7 @@
 )
 
 
-@with_eip4844_and_later
+@with_deneb_and_later
 @spec_state_test
 def test_verify_kzg_proof(spec, state):
     x = 3
@@ -24,7 +24,7 @@ def test_verify_kzg_proof(spec, state):
     assert spec.verify_kzg_proof_impl(commitment, x, y, proof)
 
 
-@with_eip4844_and_later
+@with_deneb_and_later
 @spec_state_test
 def test_barycentric_outside_domain(spec, state):
     """
@@ -57,7 +57,7 @@ def test_barycentric_outside_domain(spec, state):
         assert p_z_coeff == p_z_eval
 
 
-@with_eip4844_and_later
+@with_deneb_and_later
 @spec_state_test
 def test_barycentric_within_domain(spec, state):
     """
@@ -87,3 +87,23 @@ def test_barycentric_within_domain(spec, state):
         # The two evaluations should be agree and p(z) should also be the i-th "coefficient" of the polynomial in
         # evaluation form
         assert p_z_coeff == p_z_eval == poly_eval[i]
+
+
+@with_deneb_and_later
+@spec_state_test
+def test_compute_kzg_proof_within_domain(spec, state):
+    """
+    Create and verify KZG proof that p(z) == y
+    where z is in the domain of our KZG scheme (i.e. a relevant root of unity).
+    """
+    blob = get_sample_blob(spec)
+    commitment = spec.blob_to_kzg_commitment(blob)
+    polynomial = spec.blob_to_polynomial(blob)
+
+    roots_of_unity_brp = spec.bit_reversal_permutation(spec.ROOTS_OF_UNITY)
+
+    for i, z in enumerate(roots_of_unity_brp):
+        proof = spec.compute_kzg_proof_impl(polynomial, z)
+
+        y = spec.evaluate_polynomial_in_evaluation_form(polynomial, z)
+        assert spec.verify_kzg_proof_impl(commitment, z, y, proof)
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_kzg.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/test_kzg.py
similarity index 91%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/test_kzg.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/test_kzg.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_kzg.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/unittests/test_kzg.py
@@ -1,6 +1,6 @@
 
 from eth2spec.test.helpers.constants import (
-    EIP4844,
+    DENEB,
     MINIMAL,
 )
 from eth2spec.test.helpers.sharding import (
@@ -13,7 +13,7 @@
 )
 
 
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @spec_state_test
 @with_presets([MINIMAL])
 def test_blob_to_kzg_commitment(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_offset.py b/tests/core/pyspec/eth2spec/test/deneb/unittests/test_offset.py
similarity index 94%
rename from tests/core/pyspec/eth2spec/test/eip4844/unittests/test_offset.py
rename to tests/core/pyspec/eth2spec/test/deneb/unittests/test_offset.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_offset.py
+++ b/tests/core/pyspec/eth2spec/test/deneb/unittests/test_offset.py
@@ -1,6 +1,6 @@
 
 from eth2spec.test.helpers.constants import (
-    EIP4844,
+    DENEB,
     MINIMAL,
 )
 from eth2spec.test.helpers.sharding import (
@@ -13,7 +13,7 @@
 )
 
 
-@with_phases([EIP4844])
+@with_phases([DENEB])
 @spec_state_test
 @with_presets([MINIMAL])
 def test_tx_peek_blob_versioned_hashes(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_random.py b/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_random.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_random.py
+++ /dev/null
@@ -1,84 +0,0 @@
-from random import Random
-
-from eth2spec.test.context import (
-    with_phases,
-    with_custom_state,
-    with_presets,
-    spec_test, with_state,
-    low_balances, misc_balances, large_validator_set,
-)
-from eth2spec.test.utils import with_meta_tags
-from eth2spec.test.helpers.constants import (
-    CAPELLA, EIP4844,
-    MINIMAL,
-)
-from eth2spec.test.helpers.eip4844.fork import (
-    EIP4844_FORK_TEST_META_TAGS,
-    run_fork_test,
-)
-from eth2spec.test.helpers.random import randomize_state
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_0(spec, phases, state):
-    randomize_state(spec, state, rng=Random(1010))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_1(spec, phases, state):
-    randomize_state(spec, state, rng=Random(2020))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_2(spec, phases, state):
-    randomize_state(spec, state, rng=Random(3030))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_state
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_3(spec, phases, state):
-    randomize_state(spec, state, rng=Random(4040))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_custom_state(balances_fn=low_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_low_balances(spec, phases, state):
-    randomize_state(spec, state, rng=Random(5050))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@spec_test
-@with_custom_state(balances_fn=misc_balances, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_misc_balances(spec, phases, state):
-    randomize_state(spec, state, rng=Random(6060))
-    yield from run_fork_test(phases[EIP4844], state)
-
-
-@with_phases(phases=[CAPELLA], other_phases=[EIP4844])
-@with_presets([MINIMAL],
-              reason="mainnet config leads to larger validator set than limit of public/private keys pre-generated")
-@spec_test
-@with_custom_state(balances_fn=large_validator_set, threshold_fn=lambda spec: spec.config.EJECTION_BALANCE)
-@with_meta_tags(EIP4844_FORK_TEST_META_TAGS)
-def test_eip4844_fork_random_large_validator_set(spec, phases, state):
-    randomize_state(spec, state, rng=Random(7070))
-    yield from run_fork_test(phases[EIP4844], state)
diff --git a/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/test_validate_blobs_sidecar.py b/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/test_validate_blobs_sidecar.py
deleted file mode 100644
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/test_validate_blobs_sidecar.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from eth2spec.test.helpers.state import (
-    state_transition_and_sign_block,
-)
-from eth2spec.test.helpers.block import (
-    build_empty_block_for_next_slot
-)
-from eth2spec.test.context import (
-    spec_state_test,
-    with_eip4844_and_later,
-)
-from eth2spec.test.helpers.execution_payload import (
-    compute_el_block_hash,
-)
-from eth2spec.test.helpers.sharding import (
-    get_sample_opaque_tx,
-)
-
-
-def _run_validate_blobs_sidecar_test(spec, state, blob_count):
-    block = build_empty_block_for_next_slot(spec, state)
-    opaque_tx, blobs, blob_kzg_commitments = get_sample_opaque_tx(spec, blob_count=blob_count)
-    block.body.blob_kzg_commitments = blob_kzg_commitments
-    block.body.execution_payload.transactions = [opaque_tx]
-    block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload)
-    state_transition_and_sign_block(spec, state, block)
-
-    blobs_sidecar = spec.get_blobs_sidecar(block, blobs)
-    expected_commitments = [spec.blob_to_kzg_commitment(blobs[i]) for i in range(blob_count)]
-    spec.validate_blobs_sidecar(block.slot, block.hash_tree_root(), expected_commitments, blobs_sidecar)
-
-
-@with_eip4844_and_later
-@spec_state_test
-def test_validate_blobs_sidecar_zero_blobs(spec, state):
-    _run_validate_blobs_sidecar_test(spec, state, blob_count=0)
-
-
-@with_eip4844_and_later
-@spec_state_test
-def test_validate_blobs_sidecar_one_blob(spec, state):
-    _run_validate_blobs_sidecar_test(spec, state, blob_count=1)
-
-
-@with_eip4844_and_later
-@spec_state_test
-def test_validate_blobs_sidecar_two_blobs(spec, state):
-    _run_validate_blobs_sidecar_test(spec, state, blob_count=2)
-
-
-@with_eip4844_and_later
-@spec_state_test
-def test_validate_blobs_sidecar_max_blobs(spec, state):
-    _run_validate_blobs_sidecar_test(spec, state, blob_count=spec.MAX_BLOBS_PER_BLOCK)
diff --git a/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py b/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
--- a/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
@@ -29,14 +29,12 @@ def run_fork_test(post_spec, pre_state):
         'inactivity_scores',
         # Sync
         'current_sync_committee', 'next_sync_committee',
-        # Execution
-        'latest_execution_payload_header',
     ]
     for field in stable_fields:
         assert getattr(pre_state, field) == getattr(post_state, field)
 
     # Modified fields
-    modified_fields = ['fork']
+    modified_fields = ['fork', 'latest_execution_payload_header']
     for field in modified_fields:
         assert getattr(pre_state, field) != getattr(post_state, field)
 
diff --git a/tests/core/pyspec/eth2spec/test/helpers/constants.py b/tests/core/pyspec/eth2spec/test/helpers/constants.py
--- a/tests/core/pyspec/eth2spec/test/helpers/constants.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/constants.py
@@ -14,25 +14,25 @@
 SHARDING = SpecForkName('sharding')
 CUSTODY_GAME = SpecForkName('custody_game')
 DAS = SpecForkName('das')
-EIP4844 = SpecForkName('eip4844')
+DENEB = SpecForkName('deneb')
 
 # The forks that pytest can run with.
 ALL_PHASES = (
     # Formal forks
     PHASE0, ALTAIR, BELLATRIX, CAPELLA,
     # Experimental patches
-    EIP4844,
+    DENEB,
 )
 # The forks that output to the test vectors.
-TESTGEN_FORKS = (PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844)
+TESTGEN_FORKS = (PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB)
 
-# TODO: no EIP4844 fork tests now. Should add when we figure out the content of Capella.
+# TODO: no DENEB fork tests now. Should add when we figure out the content of Capella.
 ALL_FORK_UPGRADES = {
     # pre_fork_name: post_fork_name
     PHASE0: ALTAIR,
     ALTAIR: BELLATRIX,
     BELLATRIX: CAPELLA,
-    CAPELLA: EIP4844,
+    CAPELLA: DENEB,
 }
 ALL_PRE_POST_FORKS = ALL_FORK_UPGRADES.items()
 AFTER_BELLATRIX_UPGRADES = {key: value for key, value in ALL_FORK_UPGRADES.items() if key != PHASE0}
diff --git a/tests/core/pyspec/eth2spec/test/helpers/eip4844/__init__.py b/tests/core/pyspec/eth2spec/test/helpers/deneb/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/helpers/eip4844/__init__.py
rename to tests/core/pyspec/eth2spec/test/helpers/deneb/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/helpers/eip4844/fork.py b/tests/core/pyspec/eth2spec/test/helpers/deneb/fork.py
similarity index 90%
rename from tests/core/pyspec/eth2spec/test/helpers/eip4844/fork.py
rename to tests/core/pyspec/eth2spec/test/helpers/deneb/fork.py
--- a/tests/core/pyspec/eth2spec/test/helpers/eip4844/fork.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/deneb/fork.py
@@ -1,17 +1,17 @@
 from eth2spec.test.helpers.constants import (
-    EIP4844,
+    DENEB,
 )
 
 
-EIP4844_FORK_TEST_META_TAGS = {
-    'fork': EIP4844,
+DENEB_FORK_TEST_META_TAGS = {
+    'fork': DENEB,
 }
 
 
 def run_fork_test(post_spec, pre_state):
     yield 'pre', pre_state
 
-    post_state = post_spec.upgrade_to_eip4844(pre_state)
+    post_state = post_spec.upgrade_to_deneb(pre_state)
 
     # Stable fields
     stable_fields = [
@@ -57,7 +57,7 @@ def run_fork_test(post_spec, pre_state):
             assert getattr(pre_validator, field) == getattr(post_validator, field)
 
     assert pre_state.fork.current_version == post_state.fork.previous_version
-    assert post_state.fork.current_version == post_spec.config.EIP4844_FORK_VERSION
+    assert post_state.fork.current_version == post_spec.config.DENEB_FORK_VERSION
     assert post_state.fork.epoch == post_spec.get_current_epoch(post_state)
 
     yield 'post', post_state
diff --git a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
--- a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
@@ -4,7 +4,7 @@
 from rlp.sedes import big_endian_int, Binary, List
 
 from eth2spec.debug.random_value import get_random_bytes_list
-from eth2spec.test.helpers.forks import is_post_capella, is_post_eip4844
+from eth2spec.test.helpers.forks import is_post_capella, is_post_deneb
 
 
 def get_execution_payload_header(spec, execution_payload):
@@ -26,7 +26,7 @@ def get_execution_payload_header(spec, execution_payload):
     )
     if is_post_capella(spec):
         payload_header.withdrawals_root = spec.hash_tree_root(execution_payload.withdrawals)
-    if is_post_eip4844(spec):
+    if is_post_deneb(spec):
         payload_header.excess_data_gas = execution_payload.excess_data_gas
     return payload_header
 
@@ -89,7 +89,7 @@ def compute_el_header_block_hash(spec,
     if is_post_capella(spec):
         # withdrawals_root
         execution_payload_header_rlp.append((Binary(32, 32), withdrawals_trie_root))
-    if is_post_eip4844(spec):
+    if is_post_deneb(spec):
         # excess_data_gas
         execution_payload_header_rlp.append((big_endian_int, payload_header.excess_data_gas))
 
diff --git a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
--- a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
@@ -14,7 +14,7 @@
     ALTAIR,
     BELLATRIX,
     CAPELLA,
-    EIP4844,
+    DENEB,
 )
 from eth2spec.test.helpers.deposits import (
     prepare_state_and_deposit,
@@ -153,8 +153,8 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, operation_dict=
         state = post_spec.upgrade_to_bellatrix(state)
     elif post_spec.fork == CAPELLA:
         state = post_spec.upgrade_to_capella(state)
-    elif post_spec.fork == EIP4844:
-        state = post_spec.upgrade_to_eip4844(state)
+    elif post_spec.fork == DENEB:
+        state = post_spec.upgrade_to_deneb(state)
 
     assert state.fork.epoch == fork_epoch
 
@@ -167,9 +167,9 @@ def do_fork(state, spec, post_spec, fork_epoch, with_block=True, operation_dict=
     elif post_spec.fork == CAPELLA:
         assert state.fork.previous_version == post_spec.config.BELLATRIX_FORK_VERSION
         assert state.fork.current_version == post_spec.config.CAPELLA_FORK_VERSION
-    elif post_spec.fork == EIP4844:
+    elif post_spec.fork == DENEB:
         assert state.fork.previous_version == post_spec.config.CAPELLA_FORK_VERSION
-        assert state.fork.current_version == post_spec.config.EIP4844_FORK_VERSION
+        assert state.fork.current_version == post_spec.config.DENEB_FORK_VERSION
 
     if with_block:
         return state, _state_transition_and_sign_block_at_slot(post_spec, state, operation_dict=operation_dict)
diff --git a/tests/core/pyspec/eth2spec/test/helpers/forks.py b/tests/core/pyspec/eth2spec/test/helpers/forks.py
--- a/tests/core/pyspec/eth2spec/test/helpers/forks.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/forks.py
@@ -1,11 +1,11 @@
 from .constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB,
 )
 
 
 def is_post_fork(a, b):
-    if a == EIP4844:
-        return b in [PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844]
+    if a == DENEB:
+        return b in [PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB]
     if a == CAPELLA:
         return b in [PHASE0, ALTAIR, BELLATRIX, CAPELLA]
     if a == BELLATRIX:
@@ -29,5 +29,5 @@ def is_post_capella(spec):
     return is_post_fork(spec.fork, CAPELLA)
 
 
-def is_post_eip4844(spec):
-    return is_post_fork(spec.fork, EIP4844)
+def is_post_deneb(spec):
+    return is_post_fork(spec.fork, DENEB)
diff --git a/tests/core/pyspec/eth2spec/test/helpers/genesis.py b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
--- a/tests/core/pyspec/eth2spec/test/helpers/genesis.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/genesis.py
@@ -1,5 +1,5 @@
 from eth2spec.test.helpers.constants import (
-    ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    ALTAIR, BELLATRIX, CAPELLA, DENEB,
 )
 from eth2spec.test.helpers.execution_payload import (
     compute_el_header_block_hash,
@@ -77,9 +77,9 @@ def create_genesis_state(spec, validator_balances, activation_threshold):
     elif spec.fork == CAPELLA:
         previous_version = spec.config.BELLATRIX_FORK_VERSION
         current_version = spec.config.CAPELLA_FORK_VERSION
-    elif spec.fork == EIP4844:
+    elif spec.fork == DENEB:
         previous_version = spec.config.CAPELLA_FORK_VERSION
-        current_version = spec.config.EIP4844_FORK_VERSION
+        current_version = spec.config.DENEB_FORK_VERSION
 
     state = spec.BeaconState(
         genesis_time=0,
diff --git a/tests/core/pyspec/eth2spec/test/helpers/sharding.py b/tests/core/pyspec/eth2spec/test/helpers/sharding.py
--- a/tests/core/pyspec/eth2spec/test/helpers/sharding.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/sharding.py
@@ -12,7 +12,7 @@
 
 
 #
-# Containers from EIP-4844
+# Containers from Deneb
 #
 MAX_CALLDATA_SIZE = 2**24
 MAX_VERSIONED_HASHES_LIST_SIZE = 2**24
diff --git a/tests/core/pyspec/eth2spec/test/helpers/state.py b/tests/core/pyspec/eth2spec/test/helpers/state.py
--- a/tests/core/pyspec/eth2spec/test/helpers/state.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/state.py
@@ -38,9 +38,8 @@ def transition_to_slot_via_block(spec, state, slot):
     Transition to ``slot`` via an empty block transition
     """
     assert state.slot < slot
-    signed_block = apply_empty_block(spec, state, slot)
+    apply_empty_block(spec, state, slot)
     assert state.slot == slot
-    return signed_block
 
 
 def transition_to_valid_shard_slot(spec, state):
diff --git a/tests/core/pyspec/eth2spec/test/utils/randomized_block_tests.py b/tests/core/pyspec/eth2spec/test/utils/randomized_block_tests.py
--- a/tests/core/pyspec/eth2spec/test/utils/randomized_block_tests.py
+++ b/tests/core/pyspec/eth2spec/test/utils/randomized_block_tests.py
@@ -88,7 +88,7 @@ def randomize_state_capella(spec, state, stats, exit_fraction=0.1, slash_fractio
     return scenario_state
 
 
-def randomize_state_eip4844(spec, state, stats, exit_fraction=0.1, slash_fraction=0.1):
+def randomize_state_deneb(spec, state, stats, exit_fraction=0.1, slash_fraction=0.1):
     scenario_state = randomize_state_capella(spec,
                                              state,
                                              stats,
@@ -232,7 +232,7 @@ def random_block_capella(spec, state, signed_blocks, scenario_state, rng=Random(
     return block
 
 
-def random_block_eip4844(spec, state, signed_blocks, scenario_state, rng=Random(3456)):
+def random_block_deneb(spec, state, signed_blocks, scenario_state, rng=Random(3456)):
     block = random_block_capella(spec, state, signed_blocks, scenario_state)
     # TODO: more commitments. blob_kzg_commitments: List[KZGCommitment, MAX_BLOBS_PER_BLOCK]
     opaque_tx, _, blob_kzg_commitments = get_sample_opaque_tx(spec, blob_count=1)
diff --git a/tests/generators/epoch_processing/main.py b/tests/generators/epoch_processing/main.py
--- a/tests/generators/epoch_processing/main.py
+++ b/tests/generators/epoch_processing/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -32,7 +32,7 @@
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
 
-    eip4844_mods = capella_mods
+    deneb_mods = capella_mods
 
     # TODO Custody Game testgen is disabled for now
     # custody_game_mods = {**{key: 'eth2spec.test.custody_game.epoch_processing.test_process_' + key for key in [
@@ -46,7 +46,7 @@
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="epoch_processing", all_mods=all_mods)
diff --git a/tests/generators/finality/main.py b/tests/generators/finality/main.py
--- a/tests/generators/finality/main.py
+++ b/tests/generators/finality/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -7,14 +7,14 @@
     altair_mods = phase_0_mods  # No additional Altair specific finality tests
     bellatrix_mods = altair_mods  # No additional Bellatrix specific finality tests
     capella_mods = bellatrix_mods  # No additional Capella specific finality tests
-    eip4844_mods = capella_mods  # No additional EIP4844 specific finality tests
+    deneb_mods = capella_mods  # No additional Deneb specific finality tests
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="finality", all_mods=all_mods)
diff --git a/tests/generators/fork_choice/main.py b/tests/generators/fork_choice/main.py
--- a/tests/generators/fork_choice/main.py
+++ b/tests/generators/fork_choice/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -18,14 +18,14 @@
     ]}
     bellatrix_mods = combine_mods(_new_bellatrix_mods, altair_mods)
     capella_mods = bellatrix_mods  # No additional Capella specific fork choice tests
-    eip4844_mods = capella_mods  # No additional Capella specific fork choice tests
+    deneb_mods = capella_mods  # No additional Capella specific fork choice tests
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="fork_choice", all_mods=all_mods)
diff --git a/tests/generators/forks/main.py b/tests/generators/forks/main.py
--- a/tests/generators/forks/main.py
+++ b/tests/generators/forks/main.py
@@ -1,14 +1,14 @@
 from typing import Iterable
 
 from eth2spec.test.helpers.constants import (
-    PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844,
+    PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB,
     MINIMAL, MAINNET,
 )
 from eth2spec.test.helpers.typing import SpecForkName, PresetBaseName
 from eth2spec.test.altair.fork import test_altair_fork_basic, test_altair_fork_random
 from eth2spec.test.bellatrix.fork import test_bellatrix_fork_basic, test_bellatrix_fork_random
 from eth2spec.test.capella.fork import test_capella_fork_basic, test_capella_fork_random
-from eth2spec.test.eip4844.fork import test_eip4844_fork_basic, test_eip4844_fork_random
+from eth2spec.test.deneb.fork import test_deneb_fork_basic, test_deneb_fork_random
 from eth2spec.gen_helpers.gen_base import gen_runner, gen_typing
 from eth2spec.gen_helpers.gen_from_tests.gen import generate_from_tests
 
@@ -40,8 +40,8 @@ def _get_fork_tests_providers():
         yield create_provider(test_bellatrix_fork_random, preset, ALTAIR, BELLATRIX)
         yield create_provider(test_capella_fork_basic, preset, BELLATRIX, CAPELLA)
         yield create_provider(test_capella_fork_random, preset, BELLATRIX, CAPELLA)
-        yield create_provider(test_eip4844_fork_basic, preset, CAPELLA, EIP4844)
-        yield create_provider(test_eip4844_fork_random, preset, CAPELLA, EIP4844)
+        yield create_provider(test_deneb_fork_basic, preset, CAPELLA, DENEB)
+        yield create_provider(test_deneb_fork_random, preset, CAPELLA, DENEB)
 
 
 if __name__ == "__main__":
diff --git a/tests/generators/genesis/main.py b/tests/generators/genesis/main.py
--- a/tests/generators/genesis/main.py
+++ b/tests/generators/genesis/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -16,13 +16,13 @@
     ]}
     bellatrix_mods = combine_mods(_new_bellatrix_mods, altair_mods)
     capella_mods = bellatrix_mods  # No additional Capella specific genesis tests
-    eip4844_mods = capella_mods  # No additional EIP4844 specific genesis tests
+    deneb_mods = capella_mods  # No additional Deneb specific genesis tests
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="genesis", all_mods=all_mods)
diff --git a/tests/generators/light_client/main.py b/tests/generators/light_client/main.py
--- a/tests/generators/light_client/main.py
+++ b/tests/generators/light_client/main.py
@@ -1,4 +1,4 @@
-from eth2spec.test.helpers.constants import ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import ALTAIR, BELLATRIX, CAPELLA, DENEB
 from eth2spec.gen_helpers.gen_from_tests.gen import combine_mods, run_state_test_generators
 
 
@@ -14,13 +14,13 @@
         'single_merkle_proof',
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
-    eip4844_mods = capella_mods
+    deneb_mods = capella_mods
 
     all_mods = {
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="light_client", all_mods=all_mods)
diff --git a/tests/generators/operations/main.py b/tests/generators/operations/main.py
--- a/tests/generators/operations/main.py
+++ b/tests/generators/operations/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -36,7 +36,7 @@
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
 
-    eip4844_mods = capella_mods
+    deneb_mods = capella_mods
 
     # TODO Custody Game testgen is disabled for now
     # _new_custody_game_mods = {key: 'eth2spec.test.custody_game.block_processing.test_process_' + key for key in [
@@ -53,7 +53,7 @@
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="operations", all_mods=all_mods)
diff --git a/tests/generators/random/Makefile b/tests/generators/random/Makefile
--- a/tests/generators/random/Makefile
+++ b/tests/generators/random/Makefile
@@ -6,9 +6,9 @@ all:
 	rm -f ../../core/pyspec/eth2spec/test/altair/random/test_random.py
 	rm -f ../../core/pyspec/eth2spec/test/bellatrix/random/test_random.py
 	rm -f ../../core/pyspec/eth2spec/test/capella/random/test_random.py
-	rm -f ../../core/pyspec/eth2spec/test/eip4844/random/test_random.py
+	rm -f ../../core/pyspec/eth2spec/test/deneb/random/test_random.py
 	python3 generate.py phase0 > ../../core/pyspec/eth2spec/test/phase0/random/test_random.py
 	python3 generate.py altair > ../../core/pyspec/eth2spec/test/altair/random/test_random.py
 	python3 generate.py bellatrix > ../../core/pyspec/eth2spec/test/bellatrix/random/test_random.py
 	python3 generate.py capella > ../../core/pyspec/eth2spec/test/capella/random/test_random.py
-	python3 generate.py eip4844 > ../../core/pyspec/eth2spec/test/eip4844/random/test_random.py
+	python3 generate.py deneb > ../../core/pyspec/eth2spec/test/deneb/random/test_random.py
diff --git a/tests/generators/random/generate.py b/tests/generators/random/generate.py
--- a/tests/generators/random/generate.py
+++ b/tests/generators/random/generate.py
@@ -21,12 +21,12 @@
     randomize_state_altair,
     randomize_state_bellatrix,
     randomize_state_capella,
-    randomize_state_eip4844,
+    randomize_state_deneb,
     random_block,
     random_block_altair_with_cycling_sync_committee_participation,
     random_block_bellatrix,
     random_block_capella,
-    random_block_eip4844,
+    random_block_deneb,
     last_slot_in_epoch,
     random_slot_in_epoch,
     penultimate_slot_in_epoch,
@@ -36,7 +36,7 @@
     transition_to_leaking,
     transition_without_leak,
 )
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 # Ensure this many blocks are present in *each* randomized scenario
@@ -274,12 +274,12 @@ def run_generate_tests_to_std_out(phase, state_randomizer, block_randomizer):
             state_randomizer=randomize_state_capella,
             block_randomizer=random_block_capella,
         )
-    if EIP4844 in sys.argv:
+    if DENEB in sys.argv:
         did_generate = True
         run_generate_tests_to_std_out(
-            EIP4844,
-            state_randomizer=randomize_state_eip4844,
-            block_randomizer=random_block_eip4844,
+            DENEB,
+            state_randomizer=randomize_state_deneb,
+            block_randomizer=random_block_deneb,
         )
     if not did_generate:
         warnings.warn("no phase given for test generation")
diff --git a/tests/generators/random/main.py b/tests/generators/random/main.py
--- a/tests/generators/random/main.py
+++ b/tests/generators/random/main.py
@@ -1,4 +1,4 @@
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
 
 
@@ -15,7 +15,7 @@
     capella_mods = {key: 'eth2spec.test.capella.random.test_' + key for key in [
         'random',
     ]}
-    eip4844_mods = {key: 'eth2spec.test.eip4844.random.test_' + key for key in [
+    deneb_mods = {key: 'eth2spec.test.deneb.random.test_' + key for key in [
         'random',
     ]}
 
@@ -24,7 +24,7 @@
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="random", all_mods=all_mods)
diff --git a/tests/generators/rewards/main.py b/tests/generators/rewards/main.py
--- a/tests/generators/rewards/main.py
+++ b/tests/generators/rewards/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -16,14 +16,14 @@
     # Transaction fees are part of the execution-layer.
     bellatrix_mods = altair_mods
     capella_mods = bellatrix_mods
-    eip4844_mods = capella_mods
+    deneb_mods = capella_mods
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="rewards", all_mods=all_mods)
diff --git a/tests/generators/sanity/main.py b/tests/generators/sanity/main.py
--- a/tests/generators/sanity/main.py
+++ b/tests/generators/sanity/main.py
@@ -1,4 +1,4 @@
-from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators, combine_mods
 
 
@@ -23,17 +23,17 @@
     ]}
     capella_mods = combine_mods(_new_capella_mods, bellatrix_mods)
 
-    _new_eip4844_mods = {key: 'eth2spec.test.eip4844.sanity.test_' + key for key in [
+    _new_deneb_mods = {key: 'eth2spec.test.deneb.sanity.test_' + key for key in [
         'blocks',
     ]}
-    eip4844_mods = combine_mods(_new_eip4844_mods, capella_mods)
+    deneb_mods = combine_mods(_new_deneb_mods, capella_mods)
 
     all_mods = {
         PHASE0: phase_0_mods,
         ALTAIR: altair_mods,
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="sanity", all_mods=all_mods)
diff --git a/tests/generators/sync/main.py b/tests/generators/sync/main.py
--- a/tests/generators/sync/main.py
+++ b/tests/generators/sync/main.py
@@ -1,5 +1,5 @@
 from eth2spec.gen_helpers.gen_from_tests.gen import run_state_test_generators
-from eth2spec.test.helpers.constants import BELLATRIX, CAPELLA, EIP4844
+from eth2spec.test.helpers.constants import BELLATRIX, CAPELLA, DENEB
 
 
 if __name__ == "__main__":
@@ -7,12 +7,12 @@
         'optimistic',
     ]}
     capella_mods = bellatrix_mods
-    eip4844_mods = capella_mods
+    deneb_mods = capella_mods
 
     all_mods = {
         BELLATRIX: bellatrix_mods,
         CAPELLA: capella_mods,
-        EIP4844: eip4844_mods,
+        DENEB: deneb_mods,
     }
 
     run_state_test_generators(runner_name="sync", all_mods=all_mods)
diff --git a/tests/generators/transition/main.py b/tests/generators/transition/main.py
--- a/tests/generators/transition/main.py
+++ b/tests/generators/transition/main.py
@@ -16,8 +16,8 @@
     test_slashing as test_altair_slashing,
     test_operations as test_altair_operations,
 )
-from eth2spec.test.eip4844.transition import (
-    test_operations as test_eip4844_operations,
+from eth2spec.test.deneb.transition import (
+    test_operations as test_deneb_operations,
 )
 
 
@@ -46,7 +46,7 @@ def cases_fn() -> Iterable[gen_typing.TestCase]:
         test_altair_leaking,
         test_altair_slashing,
         test_altair_operations,
-        test_eip4844_operations,
+        test_deneb_operations,
     )
     for transition_test_module in all_tests:
         for pre_fork, post_fork in ALL_PRE_POST_FORKS: