diff --git a/presets/mainnet/epbs.yaml b/presets/mainnet/eip-xxxx.yaml
similarity index 84%
rename from presets/mainnet/epbs.yaml
rename to presets/mainnet/eip-xxxx.yaml
index a7573176b3..6b081bbf34 100644
--- a/presets/mainnet/epbs.yaml
+++ b/presets/mainnet/eip-xxxx.yaml
@@ -1,4 +1,4 @@
-# Mainnet preset - epbs
+# Mainnet preset - EIPXXXX
 
 # Execution
 # ---------------------------------------------------------------
diff --git a/presets/minimal/epbs.yaml b/presets/minimal/eip-xxxx.yaml
similarity index 84%
rename from presets/minimal/epbs.yaml
rename to presets/minimal/eip-xxxx.yaml
index cbf7fb41c3..d596ed8971 100644
--- a/presets/minimal/epbs.yaml
+++ b/presets/minimal/eip-xxxx.yaml
@@ -1,4 +1,4 @@
-# Minimal preset - epbs
+# Minimal preset - EIPXXXX
 
 # Execution
 # ---------------------------------------------------------------
diff --git a/pysetup/constants.py b/pysetup/constants.py
index d4ef81dc9a..0f91c981d9 100644
--- a/pysetup/constants.py
+++ b/pysetup/constants.py
@@ -8,7 +8,7 @@
 EIP7594 = 'eip7594'
 EIP6800 = 'eip6800'
 WHISK = 'whisk'
-EPBS = 'epbs'
+EIPXXXX = 'eipxxxx'
 
 
 # The helper functions that are used when defining constants
diff --git a/pysetup/md_doc_paths.py b/pysetup/md_doc_paths.py
index 2f7e2900cf..96d27a74e5 100644
--- a/pysetup/md_doc_paths.py
+++ b/pysetup/md_doc_paths.py
@@ -10,7 +10,7 @@
     WHISK,
     EIP7594,
     EIP6800,
-    EPBS,
+    EIPXXXX,
 )
 
 
@@ -24,7 +24,7 @@
     WHISK: CAPELLA,
     EIP7594: DENEB,
     EIP6800: DENEB,
-    EPBS: ELECTRA,
+    EIPXXXX: ELECTRA,
 }
 
 ALL_FORKS = list(PREVIOUS_FORK_OF.keys())
diff --git a/pysetup/spec_builders/__init__.py b/pysetup/spec_builders/__init__.py
index bfcb39a578..3c8be80b16 100644
--- a/pysetup/spec_builders/__init__.py
+++ b/pysetup/spec_builders/__init__.py
@@ -7,13 +7,13 @@
 from .whisk import WhiskSpecBuilder
 from .eip7594 import EIP7594SpecBuilder
 from .eip6800 import EIP6800SpecBuilder
-from .epbs import EPBSSpecBuilder
+from .eipxxxx import EIPXXXXSpecBuilder
 
 
 spec_builders = {
     builder.fork: builder
     for builder in (
         Phase0SpecBuilder, AltairSpecBuilder, BellatrixSpecBuilder, CapellaSpecBuilder, DenebSpecBuilder,
-        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder, EPBSSpecBuilder,
+        ElectraSpecBuilder, WhiskSpecBuilder, EIP7594SpecBuilder, EIP6800SpecBuilder, EIPXXXXSpecBuilder,
     )
 }
diff --git a/pysetup/spec_builders/epbs.py b/pysetup/spec_builders/eipxxxx.py
similarity index 73%
rename from pysetup/spec_builders/epbs.py
rename to pysetup/spec_builders/eipxxxx.py
index 1abb80f2e9..dcb267d736 100644
--- a/pysetup/spec_builders/epbs.py
+++ b/pysetup/spec_builders/eipxxxx.py
@@ -1,16 +1,16 @@
 from typing import Dict
 
 from .base import BaseSpecBuilder
-from ..constants import EPBS
+from ..constants import EIPXXXX
 
 
-class EPBSSpecBuilder(BaseSpecBuilder):
-    fork: str = EPBS
+class EIPXXXXSpecBuilder(BaseSpecBuilder):
+    fork: str = EIPXXXX
 
     @classmethod
     def imports(cls, preset_name: str):
         return f'''
-from eth2spec.epbs import {preset_name} as epbs
+from eth2spec.eipxxxx import {preset_name} as eipxxxx
 '''
 
     @classmethod
diff --git a/specs/_features/epbs/beacon-chain.md b/specs/_features/eipxxxx/beacon-chain.md
similarity index 100%
rename from specs/_features/epbs/beacon-chain.md
rename to specs/_features/eipxxxx/beacon-chain.md
diff --git a/specs/_features/epbs/builder.md b/specs/_features/eipxxxx/builder.md
similarity index 100%
rename from specs/_features/epbs/builder.md
rename to specs/_features/eipxxxx/builder.md
diff --git a/specs/_features/epbs/fork-choice.md b/specs/_features/eipxxxx/fork-choice.md
similarity index 100%
rename from specs/_features/epbs/fork-choice.md
rename to specs/_features/eipxxxx/fork-choice.md
diff --git a/specs/_features/epbs/fork.md b/specs/_features/eipxxxx/fork.md
similarity index 100%
rename from specs/_features/epbs/fork.md
rename to specs/_features/eipxxxx/fork.md
diff --git a/specs/_features/epbs/p2p-interface.md b/specs/_features/eipxxxx/p2p-interface.md
similarity index 100%
rename from specs/_features/epbs/p2p-interface.md
rename to specs/_features/eipxxxx/p2p-interface.md
diff --git a/specs/_features/epbs/validator.md b/specs/_features/eipxxxx/validator.md
similarity index 100%
rename from specs/_features/epbs/validator.md
rename to specs/_features/eipxxxx/validator.md
diff --git a/tests/core/pyspec/eth2spec/epbs/__init__.py b/tests/core/pyspec/eth2spec/eipxxxx/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/epbs/__init__.py
rename to tests/core/pyspec/eth2spec/eipxxxx/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/helpers/constants.py b/tests/core/pyspec/eth2spec/test/helpers/constants.py
index 43fc4139bc..2fbbfb90d6 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/constants.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/constants.py
@@ -20,7 +20,7 @@
 ELECTRA = SpecForkName('electra')
 WHISK = SpecForkName('whisk')
 EIP7594 = SpecForkName('eip7594')
-EPBS = SpecForkName('epbs')
+EIPXXXX = SpecForkName('eipxxxx')
 
 #
 # SpecFork settings
@@ -38,12 +38,12 @@
     ELECTRA,
     # Experimental patches
     EIP7594,
-    EPBS,
+    EIPXXXX,
 )
 # The forks that have light client specs
 LIGHT_CLIENT_TESTING_FORKS = (*[item for item in MAINNET_FORKS if item != PHASE0],)
 # The forks that output to the test vectors.
-TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK, EPBS)
+TESTGEN_FORKS = (*MAINNET_FORKS, ELECTRA, EIP7594, WHISK, EIPXXXX)
 # Forks allowed in the test runner `--fork` flag, to fail fast in case of typos
 ALLOWED_TEST_RUNNER_FORKS = (*ALL_PHASES, WHISK)
 
@@ -59,7 +59,7 @@
     # Experimental patches
     WHISK: CAPELLA,
     EIP7594: DENEB,
-    EPBS: ELECTRA,
+    EIPXXXX: ELECTRA,
 }
 
 # For fork transition tests
@@ -70,7 +70,7 @@
     BELLATRIX: CAPELLA,
     CAPELLA: DENEB,
     DENEB: ELECTRA,
-    ELECTRA: EPBS,
+    ELECTRA: EIPXXXX,
 }
 
 ALL_PRE_POST_FORKS = POST_FORK_OF.items()