Replaced EIP4844 references with Deneb

Fixes #3207
2023-01-23 15:08:34 +01:00 · 2023-01-23 15:08:34 +01:00 · 317facbd64
parent 0f2d25d919
commit 317facbd64
59 changed files with 407 additions and 407 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -142,7 +142,7 @@ jobs:
          command: make citest fork=capella
      - store_test_results:
          path: tests/core/pyspec/test-reports
-  test-eip4844:
+  test-deneb:
    docker:
      - image: circleci/python:3.8
    working_directory: ~/specs-repo
@ -152,7 +152,7 @@ jobs:
      - restore_pyspec_cached_venv
      - run:
          name: Run py-tests
-          command: make citest fork=eip4844
+          command: make citest fork=deneb
      - store_test_results:
          path: tests/core/pyspec/test-reports
  table_of_contents:
@ -272,7 +272,7 @@ workflows:
      - test-capella:
          requires:
            - install_pyspec_test
-      - test-eip4844:
+      - test-deneb:
          requires:
            - install_pyspec_test
      - table_of_contents
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@ -83,7 +83,7 @@ jobs:
    needs: [preclear,lint,codespell,table_of_contents]
    strategy:
      matrix:
-        version: ["phase0", "altair", "bellatrix", "capella", "eip4844"]
+        version: ["phase0", "altair", "bellatrix", "capella", "deneb"]
    steps:
      - name: Checkout this repo
        uses: actions/checkout@v3.2.0
--- a/.gitignore
+++ b/.gitignore
@ -19,7 +19,7 @@ tests/core/pyspec/eth2spec/phase0/
 tests/core/pyspec/eth2spec/altair/
 tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
-tests/core/pyspec/eth2spec/eip4844/
+tests/core/pyspec/eth2spec/deneb/

 # coverage reports
 .htmlcov
--- a/12
+++ b/12
@ -30,7 +30,7 @@ MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/phase0/*.md) \
                 $(wildcard $(SPEC_DIR)/custody/*.md) \
                 $(wildcard $(SPEC_DIR)/das/*.md) \
                 $(wildcard $(SPEC_DIR)/sharding/*.md) \
-                 $(wildcard $(SPEC_DIR)/eip4844/*.md) $(wildcard $(SPEC_DIR)/eip4844/**/*.md) \
+                 $(wildcard $(SPEC_DIR)/deneb/*.md) $(wildcard $(SPEC_DIR)/deneb/**/*.md) \
                 $(wildcard $(SSZ_DIR)/*.md)

 COV_HTML_OUT=.htmlcov
@ -67,7 +67,7 @@ partial_clean:
 	rm -rf $(ETH2SPEC_MODULE_DIR)/altair
 	rm -rf $(ETH2SPEC_MODULE_DIR)/bellatrix
 	rm -rf $(ETH2SPEC_MODULE_DIR)/capella
-	rm -rf $(ETH2SPEC_MODULE_DIR)/eip4844
+	rm -rf $(ETH2SPEC_MODULE_DIR)/deneb
 	rm -rf $(COV_HTML_OUT_DIR)
 	rm -rf $(TEST_REPORT_DIR)
 	rm -rf eth2spec.egg-info dist build
@ -105,12 +105,12 @@ install_test:
 # Testing against `minimal` or `mainnet` config by default
 test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.$(TEST_PRESET_TYPE) --cov=eth2spec.altair.$(TEST_PRESET_TYPE) --cov=eth2spec.bellatrix.$(TEST_PRESET_TYPE) --cov=eth2spec.capella.$(TEST_PRESET_TYPE) --cov=eth2spec.eip4844.$(TEST_PRESET_TYPE) --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -n 4 --disable-bls --cov=eth2spec.phase0.$(TEST_PRESET_TYPE) --cov=eth2spec.altair.$(TEST_PRESET_TYPE) --cov=eth2spec.bellatrix.$(TEST_PRESET_TYPE) --cov=eth2spec.capella.$(TEST_PRESET_TYPE) --cov=eth2spec.deneb.$(TEST_PRESET_TYPE) --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec

 # Testing against `minimal` or `mainnet` config by default
 find_test: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
-	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.$(TEST_PRESET_TYPE) --cov=eth2spec.altair.$(TEST_PRESET_TYPE) --cov=eth2spec.bellatrix.$(TEST_PRESET_TYPE) --cov=eth2spec.capella.$(TEST_PRESET_TYPE) --cov=eth2spec.eip4844.$(TEST_PRESET_TYPE) --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec
+	python3 -m pytest -k=$(K) --disable-bls --cov=eth2spec.phase0.$(TEST_PRESET_TYPE) --cov=eth2spec.altair.$(TEST_PRESET_TYPE) --cov=eth2spec.bellatrix.$(TEST_PRESET_TYPE) --cov=eth2spec.capella.$(TEST_PRESET_TYPE) --cov=eth2spec.deneb.$(TEST_PRESET_TYPE) --cov-report="html:$(COV_HTML_OUT)" --cov-branch eth2spec

 citest: pyspec
 	mkdir -p $(TEST_REPORT_DIR);
@ -142,8 +142,8 @@ codespell:
 lint: pyspec
 	. venv/bin/activate; cd $(PY_SPEC_DIR); \
 	flake8  --config $(LINTER_CONFIG_FILE) ./eth2spec \
-	&& pylint --rcfile $(LINTER_CONFIG_FILE) ./eth2spec/phase0 ./eth2spec/altair ./eth2spec/bellatrix ./eth2spec/capella ./eth2spec/eip4844 \
-	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.altair -p eth2spec.bellatrix -p eth2spec.capella -p eth2spec.eip4844
+	&& pylint --rcfile $(LINTER_CONFIG_FILE) ./eth2spec/phase0 ./eth2spec/altair ./eth2spec/bellatrix ./eth2spec/capella ./eth2spec/deneb \
+	&& mypy --config-file $(LINTER_CONFIG_FILE) -p eth2spec.phase0 -p eth2spec.altair -p eth2spec.bellatrix -p eth2spec.capella -p eth2spec.deneb

 lint_generators: pyspec
 	. venv/bin/activate; cd $(TEST_GENERATORS_DIR); \
--- a/README.md
+++ b/README.md
@ -25,7 +25,7 @@ Features are researched and developed in parallel, and then consolidated into se
 | Code Name or Topic | Specs | Notes |
 | - | - | - |
 | Capella (tentative) | <ul><li>Core</li><ul><li>[Beacon chain changes](specs/capella/beacon-chain.md)</li><li>[Capella fork](specs/capella/fork.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/capella/light-client/sync-protocol.md) ([fork](specs/capella/light-client/fork.md), [full node](specs/capella/light-client/full-node.md), [networking](specs/capella/light-client/p2p-interface.md))</li></ul><ul><li>[Validator additions](specs/capella/validator.md)</li><li>[P2P networking](specs/capella/p2p-interface.md)</li></ul></ul> |
-| EIP4844 (tentative) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/eip4844/beacon-chain.md)</li><li>[EIP-4844 fork](specs/eip4844/fork.md)</li><li>[Polynomial commitments](specs/eip4844/polynomial-commitments.md)</li><li>[Fork choice changes](specs/eip4844/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/eip4844/light-client/sync-protocol.md) ([fork](specs/eip4844/light-client/fork.md), [full node](specs/eip4844/light-client/full-node.md), [networking](specs/eip4844/light-client/p2p-interface.md))</li></ul><ul><li>[Honest validator guide changes](specs/eip4844/validator.md)</li><li>[P2P networking](specs/eip4844/p2p-interface.md)</li></ul></ul> |
+| Deneb (tentative) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/deneb/beacon-chain.md)</li><li>[EIP-4844 fork](specs/deneb/fork.md)</li><li>[Polynomial commitments](specs/deneb/polynomial-commitments.md)</li><li>[Fork choice changes](specs/deneb/fork-choice.md)</li></ul><li>Additions</li><ul><li>[Light client sync protocol changes](specs/deneb/light-client/sync-protocol.md) ([fork](specs/deneb/light-client/fork.md), [full node](specs/deneb/light-client/full-node.md), [networking](specs/deneb/light-client/p2p-interface.md))</li></ul><ul><li>[Honest validator guide changes](specs/deneb/validator.md)</li><li>[P2P networking](specs/deneb/p2p-interface.md)</li></ul></ul> |
 | Sharding (outdated) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/sharding/beacon-chain.md)</li></ul><li>Additions</li><ul><li>[P2P networking](specs/sharding/p2p-interface.md)</li></ul></ul> |
 | Custody Game (outdated) | <ul><li>Core</li><ul><li>[Beacon Chain changes](specs/custody_game/beacon-chain.md)</li></ul><li>Additions</li><ul><li>[Honest validator guide changes](specs/custody_game/validator.md)</li></ul></ul> | Dependent on sharding |
 | Data Availability Sampling (outdated) | <ul><li>Core</li><ul><li>[Core types and functions](specs/das/das-core.md)</li><li>[Fork choice changes](specs/das/fork-choice.md)</li></ul><li>Additions</li><ul><li>[P2P Networking](specs/das/p2p-interface.md)</li><li>[Sampling process](specs/das/sampling.md)</li></ul></ul> | <ul><li> Dependent on sharding</li><li>[Technical explainer](https://hackmd.io/@HWeNw8hNRimMm2m2GH56Cw/B1YJPGkpD)</li></ul> |
--- a/configs/mainnet.yaml
+++ b/configs/mainnet.yaml
@ -47,9 +47,9 @@ BELLATRIX_FORK_EPOCH: 144896  # Sept 6, 2022, 11:34:47am UTC
 # Capella
 CAPELLA_FORK_VERSION: 0x03000000
 CAPELLA_FORK_EPOCH: 18446744073709551615
-# EIP4844
-EIP4844_FORK_VERSION: 0x04000000
-EIP4844_FORK_EPOCH: 18446744073709551615
+# Deneb
+DENEB_FORK_VERSION: 0x04000000
+DENEB_FORK_EPOCH: 18446744073709551615



--- a/configs/minimal.yaml
+++ b/configs/minimal.yaml
@ -46,9 +46,9 @@ BELLATRIX_FORK_EPOCH: 18446744073709551615
 # Capella
 CAPELLA_FORK_VERSION: 0x03000001
 CAPELLA_FORK_EPOCH: 18446744073709551615
-# EIP4844
-EIP4844_FORK_VERSION: 0x04000001
-EIP4844_FORK_EPOCH: 18446744073709551615
+# DENEB
+DENEB_FORK_VERSION: 0x04000001
+DENEB_FORK_EPOCH: 18446744073709551615


 # Time parameters
--- a/presets/mainnet/eip4844.yaml
+++ b/presets/mainnet/eip4844.yaml
--- a/presets/minimal/eip4844.yaml
+++ b/presets/minimal/eip4844.yaml
--- a/setup.py
+++ b/setup.py
@ -46,7 +46,7 @@ PHASE0 = 'phase0'
 ALTAIR = 'altair'
 BELLATRIX = 'bellatrix'
 CAPELLA = 'capella'
-EIP4844 = 'eip4844'
+DENEB = 'deneb'


 # The helper functions that are used when defining constants
@ -632,10 +632,10 @@ def compute_merkle_proof_for_block_body(body: BeaconBlockBody,
        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):
@ -669,7 +669,7 @@ def retrieve_blobs_sidecar(slot: Slot, beacon_block_root: Root) -> PyUnion[Blobs

 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 @@ class PySpecCommand(Command):
        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 @@ class PySpecCommand(Command):
                    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 @@ class PySpecCommand(Command):
                    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 @@ class PySpecCommand(Command):
                    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)
--- a/specs/eip4844/beacon-chain.md
+++ b/specs/eip4844/beacon-chain.md
@ -249,7 +249,7 @@ def process_blob_kzg_commitments(state: BeaconState, body: BeaconBlockBody) -> N

 *Note*: The function `initialize_beacon_state_from_eth1` is modified for pure EIP-4844 testing only.

-The `BeaconState` initialization is unchanged, except for the use of the updated `eip4844.BeaconBlockBody` type 
+The `BeaconState` initialization is unchanged, except for the use of the updated `deneb.BeaconBlockBody` type 
 when initializing the first body-root.

 ```python
@ -259,8 +259,8 @@ def initialize_beacon_state_from_eth1(eth1_block_hash: Hash32,
                                      execution_payload_header: ExecutionPayloadHeader=ExecutionPayloadHeader()
                                      ) -> BeaconState:
    fork = Fork(
-        previous_version=EIP4844_FORK_VERSION,  # [Modified in EIP-4844] for testing only
-        current_version=EIP4844_FORK_VERSION,  # [Modified in EIP-4844]
+        previous_version=DENEB_FORK_VERSION,  # [Modified in Deneb] for testing only
+        current_version=DENEB_FORK_VERSION,  # [Modified in Deneb]
        epoch=GENESIS_EPOCH,
    )
    state = BeaconState(
--- a/specs/eip4844/fork-choice.md
+++ b/specs/eip4844/fork-choice.md
--- a/specs/eip4844/fork.md
+++ b/specs/eip4844/fork.md
@ -28,8 +28,8 @@ Warning: this configuration is not definitive.

 | Name | Value |
 | - | - |
-| `EIP4844_FORK_VERSION` | `Version('0x04000000')` |
-| `EIP4844_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |
+| `DENEB_FORK_VERSION` | `Version('0x04000000')` |
+| `DENEB_FORK_EPOCH` | `Epoch(18446744073709551615)` **TBD** |

 ## Helper functions

@ -42,8 +42,8 @@ def compute_fork_version(epoch: Epoch) -> Version:
    """
    Return the fork version at the given ``epoch``.
    """
-    if epoch >= EIP4844_FORK_EPOCH:
-        return EIP4844_FORK_VERSION
+    if epoch >= DENEB_FORK_EPOCH:
+        return DENEB_FORK_VERSION
    if epoch >= CAPELLA_FORK_EPOCH:
        return CAPELLA_FORK_VERSION
    if epoch >= BELLATRIX_FORK_EPOCH:
@ -58,16 +58,16 @@ def compute_fork_version(epoch: Epoch) -> Version:
 ### Fork trigger

 TBD. This fork is defined for testing purposes, the EIP may be combined with other consensus-layer upgrade.
-For now, we assume the condition will be triggered at epoch `EIP4844_FORK_EPOCH`.
+For now, we assume the condition will be triggered at epoch `DENEB_FORK_EPOCH`.

-Note that for the pure EIP-4844 networks, we don't apply `upgrade_to_eip4844` since it starts with EIP-4844 version logic.
+Note that for the pure Deneb networks, we don't apply `upgrade_to_deneb` since it starts with Deneb version logic.

 ### Upgrading the state

-Since the `eip4844.BeaconState` format is equal to the `capella.BeaconState` format, we only have to update `BeaconState.fork`.
+Since the `deneb.BeaconState` format is equal to the `capella.BeaconState` format, we only have to update `BeaconState.fork`.

 ```python
-def upgrade_to_eip4844(pre: capella.BeaconState) -> BeaconState:
+def upgrade_to_deneb(pre: capella.BeaconState) -> BeaconState:
    epoch = capella.get_current_epoch(pre)
    latest_execution_payload_header = ExecutionPayloadHeader(
        parent_hash=pre.latest_execution_payload_header.parent_hash,
@ -94,7 +94,7 @@ def upgrade_to_eip4844(pre: capella.BeaconState) -> BeaconState:
        slot=pre.slot,
        fork=Fork(
            previous_version=pre.fork.current_version,
-            current_version=EIP4844_FORK_VERSION,  # [Modified in EIP4844]
+            current_version=DENEB_FORK_VERSION,  # [Modified in Deneb]
            epoch=epoch,
        ),
        # History
@ -127,7 +127,7 @@ def upgrade_to_eip4844(pre: capella.BeaconState) -> BeaconState:
        current_sync_committee=pre.current_sync_committee,
        next_sync_committee=pre.next_sync_committee,
        # Execution-layer
-        latest_execution_payload_header=latest_execution_payload_header,  # [Modified in EIP4844]
+        latest_execution_payload_header=latest_execution_payload_header,  # [Modified in Deneb]
        # Withdrawals
        next_withdrawal_index=pre.next_withdrawal_index,
        next_withdrawal_validator_index=pre.next_withdrawal_validator_index,
--- a/specs/eip4844/light-client/fork.md
+++ b/specs/eip4844/light-client/fork.md
@ -1,4 +1,4 @@
-# EIP4844 Light Client -- Fork Logic
+# Deneb Light Client -- Fork Logic

 ## Table of contents

@ -15,14 +15,14 @@

 ## Introduction

-This document describes how to upgrade existing light client objects based on the [Capella specification](../../capella/light-client/sync-protocol.md) to EIP4844. This is necessary when processing pre-EIP4844 data with a post-EIP4844 `LightClientStore`. Note that the data being exchanged over the network protocols uses the original format.
+This document describes how to upgrade existing light client objects based on the [Capella specification](../../capella/light-client/sync-protocol.md) to Deneb. This is necessary when processing pre-Deneb data with a post-Deneb `LightClientStore`. Note that the data being exchanged over the network protocols uses the original format.

 ### Upgrading light client data

-A EIP4844 `LightClientStore` can still process earlier light client data. In order to do so, that pre-EIP4844 data needs to be locally upgraded to EIP4844 before processing.
+A Deneb `LightClientStore` can still process earlier light client data. In order to do so, that pre-Deneb data needs to be locally upgraded to Deneb before processing.

 ```python
-def upgrade_lc_header_to_eip4844(pre: capella.LightClientHeader) -> LightClientHeader:
+def upgrade_lc_header_to_deneb(pre: capella.LightClientHeader) -> LightClientHeader:
    return LightClientHeader(
        beacon=pre.beacon,
        execution=ExecutionPayloadHeader(
@ -47,21 +47,21 @@ def upgrade_lc_header_to_eip4844(pre: capella.LightClientHeader) -> LightClientH
 ```

 ```python
-def upgrade_lc_bootstrap_to_eip4844(pre: capella.LightClientBootstrap) -> LightClientBootstrap:
+def upgrade_lc_bootstrap_to_deneb(pre: capella.LightClientBootstrap) -> LightClientBootstrap:
    return LightClientBootstrap(
-        header=upgrade_lc_header_to_eip4844(pre.header),
+        header=upgrade_lc_header_to_deneb(pre.header),
        current_sync_committee=pre.current_sync_committee,
        current_sync_committee_branch=pre.current_sync_committee_branch,
    )
 ```

 ```python
-def upgrade_lc_update_to_eip4844(pre: capella.LightClientUpdate) -> LightClientUpdate:
+def upgrade_lc_update_to_deneb(pre: capella.LightClientUpdate) -> LightClientUpdate:
    return LightClientUpdate(
-        attested_header=upgrade_lc_header_to_eip4844(pre.attested_header),
+        attested_header=upgrade_lc_header_to_deneb(pre.attested_header),
        next_sync_committee=pre.next_sync_committee,
        next_sync_committee_branch=pre.next_sync_committee_branch,
-        finalized_header=upgrade_lc_header_to_eip4844(pre.finalized_header),
+        finalized_header=upgrade_lc_header_to_deneb(pre.finalized_header),
        finality_branch=pre.finality_branch,
        sync_aggregate=pre.sync_aggregate,
        signature_slot=pre.signature_slot,
@ -69,10 +69,10 @@ def upgrade_lc_update_to_eip4844(pre: capella.LightClientUpdate) -> LightClientU
 ```

 ```python
-def upgrade_lc_finality_update_to_eip4844(pre: capella.LightClientFinalityUpdate) -> LightClientFinalityUpdate:
+def upgrade_lc_finality_update_to_deneb(pre: capella.LightClientFinalityUpdate) -> LightClientFinalityUpdate:
    return LightClientFinalityUpdate(
-        attested_header=upgrade_lc_header_to_eip4844(pre.attested_header),
-        finalized_header=upgrade_lc_header_to_eip4844(pre.finalized_header),
+        attested_header=upgrade_lc_header_to_deneb(pre.attested_header),
+        finalized_header=upgrade_lc_header_to_deneb(pre.finalized_header),
        finality_branch=pre.finality_branch,
        sync_aggregate=pre.sync_aggregate,
        signature_slot=pre.signature_slot,
@ -80,9 +80,9 @@ def upgrade_lc_finality_update_to_eip4844(pre: capella.LightClientFinalityUpdate
 ```

 ```python
-def upgrade_lc_optimistic_update_to_eip4844(pre: capella.LightClientOptimisticUpdate) -> LightClientOptimisticUpdate:
+def upgrade_lc_optimistic_update_to_deneb(pre: capella.LightClientOptimisticUpdate) -> LightClientOptimisticUpdate:
    return LightClientOptimisticUpdate(
-        attested_header=upgrade_lc_header_to_eip4844(pre.attested_header),
+        attested_header=upgrade_lc_header_to_deneb(pre.attested_header),
        sync_aggregate=pre.sync_aggregate,
        signature_slot=pre.signature_slot,
    )
@ -90,20 +90,20 @@ def upgrade_lc_optimistic_update_to_eip4844(pre: capella.LightClientOptimisticUp

 ### Upgrading the store

-Existing `LightClientStore` objects based on Capella MUST be upgraded to EIP4844 before EIP4844 based light client data can be processed. The `LightClientStore` upgrade MAY be performed before `EIP4844_FORK_EPOCH`.
+Existing `LightClientStore` objects based on Capella MUST be upgraded to Deneb before Deneb based light client data can be processed. The `LightClientStore` upgrade MAY be performed before `DENEB_FORK_EPOCH`.

 ```python
-def upgrade_lc_store_to_eip4844(pre: capella.LightClientStore) -> LightClientStore:
+def upgrade_lc_store_to_deneb(pre: capella.LightClientStore) -> LightClientStore:
    if pre.best_valid_update is None:
        best_valid_update = None
    else:
-        best_valid_update = upgrade_lc_update_to_eip4844(pre.best_valid_update)
+        best_valid_update = upgrade_lc_update_to_deneb(pre.best_valid_update)
    return LightClientStore(
-        finalized_header=upgrade_lc_header_to_eip4844(pre.finalized_header),
+        finalized_header=upgrade_lc_header_to_deneb(pre.finalized_header),
        current_sync_committee=pre.current_sync_committee,
        next_sync_committee=pre.next_sync_committee,
        best_valid_update=best_valid_update,
-        optimistic_header=upgrade_lc_header_to_eip4844(pre.optimistic_header),
+        optimistic_header=upgrade_lc_header_to_deneb(pre.optimistic_header),
        previous_max_active_participants=pre.previous_max_active_participants,
        current_max_active_participants=pre.current_max_active_participants,
    )
--- a/specs/eip4844/light-client/full-node.md
+++ b/specs/eip4844/light-client/full-node.md
@ -1,4 +1,4 @@
-# EIP4844 Light Client -- Full Node
+# Deneb Light Client -- Full Node

 **Notice**: This document is a work-in-progress for researchers and implementers.

@ -17,7 +17,7 @@

 ## Introduction

-This upgrade adds information about the execution payload to light client data as part of the EIP4844 upgrade.
+This upgrade adds information about the execution payload to light client data as part of the Deneb upgrade.

 ## Helper functions

@ -47,8 +47,8 @@ def block_to_light_client_header(block: SignedBeaconBlock) -> LightClientHeader:
            withdrawals_root=hash_tree_root(payload.withdrawals),
        )

-        # [New in EIP4844]
-        if epoch >= EIP4844_FORK_EPOCH:
+        # [New in Deneb]
+        if epoch >= DENEB_FORK_EPOCH:
            execution_header.excess_data_gas = payload.excess_data_gas

        execution_branch = compute_merkle_proof_for_block_body(block.message.body, EXECUTION_PAYLOAD_INDEX)
--- a/specs/eip4844/light-client/p2p-interface.md
+++ b/specs/eip4844/light-client/p2p-interface.md
@ -1,4 +1,4 @@
-# EIP4844 Light Client -- Networking
+# Deneb Light Client -- Networking

 **Notice**: This document is a work-in-progress for researchers and implementers.

@ -26,7 +26,7 @@

 ## Networking

-The [Capella light client networking specification](../../capella/light-client/p2p-interface.md) is extended to exchange [EIP4844 light client data](./sync-protocol.md).
+The [Capella light client networking specification](../../capella/light-client/p2p-interface.md) is extended to exchange [Deneb light client data](./sync-protocol.md).

 ### The gossip domain: gossipsub

@ -38,23 +38,23 @@ The [Capella light client networking specification](../../capella/light-client/p

 [0]: # (eth2spec: skip)

-| `fork_version`                                         | Message SSZ type                      |
-| ------------------------------------------------------ | ------------------------------------- |
-| `GENESIS_FORK_VERSION`                                 | n/a                                   |
-| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientFinalityUpdate`    |
-| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientFinalityUpdate`   |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientFinalityUpdate`   |
+| `fork_version`                                         | Message SSZ type                    |
+|--------------------------------------------------------|-------------------------------------|
+| `GENESIS_FORK_VERSION`                                 | n/a                                 |
+| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientFinalityUpdate`  |
+| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientFinalityUpdate` |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientFinalityUpdate`   |

 ###### `light_client_optimistic_update`

 [0]: # (eth2spec: skip)

 | `fork_version`                                         | Message SSZ type                      |
-| ------------------------------------------------------ | ------------------------------------- |
+|--------------------------------------------------------|---------------------------------------|
 | `GENESIS_FORK_VERSION`                                 | n/a                                   |
 | `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientOptimisticUpdate`  |
 | `CAPELLA_FORK_VERSION`                                 | `capella.LightClientOptimisticUpdate` |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientOptimisticUpdate` |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientOptimisticUpdate`   |

 ### The Req/Resp domain

@ -64,42 +64,42 @@ The [Capella light client networking specification](../../capella/light-client/p

 [0]: # (eth2spec: skip)

-| `fork_version`                                         | Response SSZ type                     |
-| ------------------------------------------------------ | ------------------------------------- |
-| `GENESIS_FORK_VERSION`                                 | n/a                                   |
-| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientBootstrap`         |
-| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientBootstrap`        |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientBootstrap`        |
+| `fork_version`                                         | Response SSZ type                  |
+|--------------------------------------------------------|------------------------------------|
+| `GENESIS_FORK_VERSION`                                 | n/a                                |
+| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientBootstrap`      |
+| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientBootstrap`     |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientBootstrap`       |

 ##### LightClientUpdatesByRange

 [0]: # (eth2spec: skip)

-| `fork_version`                                         | Response chunk SSZ type               |
-| ------------------------------------------------------ | ------------------------------------- |
-| `GENESIS_FORK_VERSION`                                 | n/a                                   |
-| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientUpdate`            |
-| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientUpdate`           |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientUpdate`           |
+| `fork_version`                                         | Response chunk SSZ type          |
+|--------------------------------------------------------|----------------------------------|
+| `GENESIS_FORK_VERSION`                                 | n/a                              |
+| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientUpdate`       |
+| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientUpdate`      |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientUpdate`        |

 ##### GetLightClientFinalityUpdate

 [0]: # (eth2spec: skip)

-| `fork_version`                                         | Response SSZ type                     |
-| ------------------------------------------------------ | ------------------------------------- |
-| `GENESIS_FORK_VERSION`                                 | n/a                                   |
-| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientFinalityUpdate`    |
-| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientFinalityUpdate`   |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientFinalityUpdate`   |
+| `fork_version`                                         | Response SSZ type                   |
+|--------------------------------------------------------|-------------------------------------|
+| `GENESIS_FORK_VERSION`                                 | n/a                                 |
+| `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientFinalityUpdate`  |
+| `CAPELLA_FORK_VERSION`                                 | `capella.LightClientFinalityUpdate` |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientFinalityUpdate`   |

 ##### GetLightClientOptimisticUpdate

 [0]: # (eth2spec: skip)

 | `fork_version`                                         | Response SSZ type                     |
-| ------------------------------------------------------ | ------------------------------------- |
+|--------------------------------------------------------|---------------------------------------|
 | `GENESIS_FORK_VERSION`                                 | n/a                                   |
 | `ALTAIR_FORK_VERSION` through `BELLATRIX_FORK_VERSION` | `altair.LightClientOptimisticUpdate`  |
 | `CAPELLA_FORK_VERSION`                                 | `capella.LightClientOptimisticUpdate` |
-| `EIP4844_FORK_VERSION` and later                       | `eip4844.LightClientOptimisticUpdate` |
+| `DENEB_FORK_VERSION` and later                         | `deneb.LightClientOptimisticUpdate`   |
--- a/specs/eip4844/light-client/sync-protocol.md
+++ b/specs/eip4844/light-client/sync-protocol.md
@ -1,4 +1,4 @@
-# EIP4844 Light Client -- Sync Protocol
+# Deneb Light Client -- Sync Protocol

 **Notice**: This document is a work-in-progress for researchers and implementers.

@ -18,7 +18,7 @@

 ## Introduction

-This upgrade updates light client data to include the EIP4844 changes to the [`ExecutionPayload`](../beacon-chain.md) structure. It extends the [Capella Light Client specifications](../../capella/light-client/sync-protocol.md). The [fork document](./fork.md) explains how to upgrade existing Capella based deployments to EIP4844.
+This upgrade updates light client data to include the Denbeb changes to the [`ExecutionPayload`](../beacon-chain.md) structure. It extends the [Capella Light Client specifications](../../capella/light-client/sync-protocol.md). The [fork document](./fork.md) explains how to upgrade existing Capella based deployments to Deneb.

 Additional documents describes the impact of the upgrade on certain roles:
 - [Full node](./full-node.md)
@ -32,11 +32,11 @@ Additional documents describes the impact of the upgrade on certain roles:
 def get_lc_execution_root(header: LightClientHeader) -> Root:
    epoch = compute_epoch_at_slot(header.beacon.slot)

-    # [New in EIP4844]
-    if epoch >= EIP4844_FORK_EPOCH:
+    # [New in Deneb]
+    if epoch >= DENEB_FORK_EPOCH:
        return hash_tree_root(header.execution)

-    # [Modified in EIP4844]
+    # [Modified in Deneb]
    if epoch >= CAPELLA_FORK_EPOCH:
        execution_header = capella.ExecutionPayloadHeader(
            parent_hash=header.execution.parent_hash,
@ -66,8 +66,8 @@ def get_lc_execution_root(header: LightClientHeader) -> Root:
 def is_valid_light_client_header(header: LightClientHeader) -> bool:
    epoch = compute_epoch_at_slot(header.beacon.slot)

-    # [New in EIP4844]
-    if epoch < EIP4844_FORK_EPOCH:
+    # [New in Deneb]
+    if epoch < DENEB_FORK_EPOCH:
        if header.execution.excess_data_gas != uint256(0):
            return False

--- a/specs/eip4844/p2p-interface.md
+++ b/specs/eip4844/p2p-interface.md
@ -124,13 +124,13 @@ Per `context = compute_fork_digest(fork_version, genesis_validators_root)`:
 | `ALTAIR_FORK_VERSION`    | `altair.SignedBeaconBlock`    |
 | `BELLATRIX_FORK_VERSION` | `bellatrix.SignedBeaconBlock` |
 | `CAPELLA_FORK_VERSION`   | `capella.SignedBeaconBlock`   |
-| `EIP4844_FORK_VERSION`   | `eip4844.SignedBeaconBlock`   |
+| `DENEB_FORK_VERSION`     | `deneb.SignedBeaconBlock`     |

 #### BeaconBlocksByRoot v2

 **Protocol ID:** `/eth2/beacon_chain/req/beacon_blocks_by_root/2/`

-After `EIP4844_FORK_EPOCH`, `BeaconBlocksByRootV2` is replaced by `BeaconBlockAndBlobsSidecarByRootV1`.
+After `DENEB_FORK_EPOCH`, `BeaconBlocksByRootV2` is replaced by `BeaconBlockAndBlobsSidecarByRootV1`.
 Clients MUST support requesting blocks by root for pre-fork-epoch blocks.

 Per `context = compute_fork_digest(fork_version, genesis_validators_root)`:
@ -175,7 +175,7 @@ No more than `MAX_REQUEST_BLOCKS` may be requested at a time.
 The response MUST consist of zero or more `response_chunk`.
 Each _successful_ `response_chunk` MUST contain a single `SignedBeaconBlockAndBlobsSidecar` payload.

-Clients MUST support requesting blocks and sidecars since `minimum_request_epoch`, where `minimum_request_epoch = max(finalized_epoch, current_epoch - MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS, EIP4844_FORK_EPOCH)`. If any root in the request content references a block earlier than `minimum_request_epoch`, peers SHOULD respond with error code `3: ResourceUnavailable`.
+Clients MUST support requesting blocks and sidecars since `minimum_request_epoch`, where `minimum_request_epoch = max(finalized_epoch, current_epoch - MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS, DENEB_FORK_EPOCH)`. If any root in the request content references a block earlier than `minimum_request_epoch`, peers SHOULD respond with error code `3: ResourceUnavailable`.

 Clients MUST respond with at least one block and sidecar, if they have it.
 Clients MAY limit the number of blocks and sidecars in the response.
@ -216,7 +216,7 @@ The response MUST consist of zero or more `response_chunk`.
 Each _successful_ `response_chunk` MUST contain a single `BlobsSidecar` payload.

 Clients MUST keep a record of signed blobs sidecars seen on the epoch range
-`[max(current_epoch - MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS, EIP4844_FORK_EPOCH), current_epoch]`
+`[max(current_epoch - MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS, DENEB_FORK_EPOCH), current_epoch]`
 where `current_epoch` is defined by the current wall-clock time,
 and clients MUST support serving requests of blocks on this range.

--- a/specs/eip4844/polynomial-commitments.md
+++ b/specs/eip4844/polynomial-commitments.md
--- a/specs/eip4844/validator.md
+++ b/specs/eip4844/validator.md
--- 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 @@ from eth2spec.test.helpers.attestations import (
    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 @@ from eth2spec.test.helpers.fork_transition import (
    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)
--- a/tests/core/pyspec/eth2spec/test/context.py
+++ b/tests/core/pyspec/eth2spec/test/context.py
@ -7,12 +7,12 @@ from eth2spec.phase0 import mainnet as spec_phase0_mainnet, minimal as spec_phas
 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 @@ spec_targets: Dict[PresetBaseName, Dict[SpecForkName, Spec]] = {
        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 with_all_phases_except(exclusion_phases):
 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):
--- a/tests/core/pyspec/eth2spec/test/eip4844/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/fork/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/fork/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/fork/test_eip4844_fork_basic.py
@ -7,76 +7,76 @@ from eth2spec.test.context import (
 )
 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)
--- 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
@ -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)
--- a/tests/core/pyspec/eth2spec/test/eip4844/random/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/random/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/random/test_random.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/random/test_random.py
@ -4,7 +4,7 @@ Please do not edit this file manually.
 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 @@ from eth2spec.test.utils.randomized_block_tests import (


@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,
--- a/tests/core/pyspec/eth2spec/test/eip4844/sanity/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/sanity/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/sanity/test_blocks.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/sanity/test_blocks.py
@ -6,7 +6,7 @@ from eth2spec.test.helpers.block import (
 )
 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 @@ from eth2spec.test.helpers.sharding import (
 )


-@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
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/unittests/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/unittests/fork_choice/init.py
--- 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
@ -6,7 +6,7 @@ from eth2spec.test.helpers.block import (
 )
 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,
@ -29,25 +29,25 @@ def _run_validate_blobs_sidecar_test(spec, state, blob_count):
    spec.validate_blobs_sidecar(block.slot, block.hash_tree_root(), expected_commitments, blobs_sidecar)


-@with_eip4844_and_later
+@with_deneb_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
+@with_deneb_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
+@with_deneb_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
+@with_deneb_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)
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/init.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/init.py
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/test_polynomial_commitments.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/unittests/polynomial_commitments/test_polynomial_commitments.py
@ -2,7 +2,7 @@ import random

 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 @@ from eth2spec.test.helpers.sharding import (
 )


-@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):
    """
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_kzg.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/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 @@ from eth2spec.test.context import (
 )


-@with_phases([EIP4844])
+@with_phases([DENEB])
@spec_state_test
@with_presets([MINIMAL])
 def test_blob_to_kzg_commitment(spec, state):
--- a/tests/core/pyspec/eth2spec/test/eip4844/unittests/test_offset.py
+++ b/tests/core/pyspec/eth2spec/test/eip4844/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 @@ from eth2spec.test.context import (
 )


-@with_phases([EIP4844])
+@with_phases([DENEB])
@spec_state_test
@with_presets([MINIMAL])
 def test_tx_peek_blob_versioned_hashes(spec, state):
--- 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
@ -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)
--- a/tests/core/pyspec/eth2spec/test/helpers/constants.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/constants.py
@ -14,25 +14,25 @@ CAPELLA = SpecForkName('capella')
 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}
--- a/tests/core/pyspec/eth2spec/test/helpers/eip4844/init.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/eip4844/init.py
--- a/tests/core/pyspec/eth2spec/test/helpers/eip4844/fork.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/eip4844/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
--- 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 import encode
 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))

--- a/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/fork_transition.py
@ -13,7 +13,7 @@ from eth2spec.test.helpers.constants import (
    ALTAIR,
    BELLATRIX,
    CAPELLA,
-    EIP4844,
+    DENEB,
 )
 from eth2spec.test.helpers.deposits import (
    prepare_state_and_deposit,
@ -151,8 +151,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

@ -165,9 +165,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)
--- 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)
--- 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,
--- 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)
--- 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 @@ if __name__ == "__main__":
    ]}
    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 @@ if __name__ == "__main__":
        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)
--- 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 @@ if __name__ == "__main__":
    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)
--- 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 @@ if __name__ == "__main__":
    ]}
    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)
--- 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__":
--- 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 @@ if __name__ == "__main__":
    ]}
    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)
--- 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 @@ if __name__ == "__main__":
        '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)
--- 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 @@ if __name__ == "__main__":
    ]}
    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 @@ if __name__ == "__main__":
        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)
--- 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
--- a/tests/generators/random/generate.py
+++ b/tests/generators/random/generate.py
@ -21,12 +21,12 @@ from eth2spec.test.utils.randomized_block_tests import (
    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 @@ from eth2spec.test.utils.randomized_block_tests import (
    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 @@ if __name__ == "__main__":
            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")
--- 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 @@ if __name__ == "__main__":
    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 @@ if __name__ == "__main__":
        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)
--- 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 @@ if __name__ == "__main__":
    # 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)
--- 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 @@ if __name__ == "__main__":
    ]}
    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)
--- 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 @@ if __name__ == "__main__":
        '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)