diff --git a/configs/mainnet/lightclient_patch.yaml b/configs/mainnet/altair.yaml
similarity index 100%
rename from configs/mainnet/lightclient_patch.yaml
rename to configs/mainnet/altair.yaml
diff --git a/configs/minimal/lightclient_patch.yaml b/configs/minimal/altair.yaml
similarity index 100%
rename from configs/minimal/lightclient_patch.yaml
rename to configs/minimal/altair.yaml
diff --git a/specs/lightclient/beacon-chain.md b/specs/altair/beacon-chain.md
similarity index 100%
rename from specs/lightclient/beacon-chain.md
rename to specs/altair/beacon-chain.md
diff --git a/specs/lightclient/fork.md b/specs/altair/fork.md
similarity index 100%
rename from specs/lightclient/fork.md
rename to specs/altair/fork.md
diff --git a/specs/lightclient/sync-protocol.md b/specs/altair/sync-protocol.md
similarity index 100%
rename from specs/lightclient/sync-protocol.md
rename to specs/altair/sync-protocol.md
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/__init__.py b/tests/core/pyspec/eth2spec/test/altair/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/__init__.py
rename to tests/core/pyspec/eth2spec/test/altair/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/block_processing/__init__.py b/tests/core/pyspec/eth2spec/test/altair/block_processing/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/block_processing/__init__.py
rename to tests/core/pyspec/eth2spec/test/altair/block_processing/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/block_processing/test_process_sync_committee.py b/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/block_processing/test_process_sync_committee.py
rename to tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/epoch_processing/__init__.py b/tests/core/pyspec/eth2spec/test/altair/epoch_processing/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/epoch_processing/__init__.py
rename to tests/core/pyspec/eth2spec/test/altair/epoch_processing/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/epoch_processing/test_process_sync_committee_updates.py b/tests/core/pyspec/eth2spec/test/altair/epoch_processing/test_process_sync_committee_updates.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/epoch_processing/test_process_sync_committee_updates.py
rename to tests/core/pyspec/eth2spec/test/altair/epoch_processing/test_process_sync_committee_updates.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/fork/__init__.py b/tests/core/pyspec/eth2spec/test/altair/fork/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/fork/__init__.py
rename to tests/core/pyspec/eth2spec/test/altair/fork/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/fork/test_fork.py b/tests/core/pyspec/eth2spec/test/altair/fork/test_fork.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/fork/test_fork.py
rename to tests/core/pyspec/eth2spec/test/altair/fork/test_fork.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/sanity/__init__.py b/tests/core/pyspec/eth2spec/test/altair/sanity/__init__.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/sanity/__init__.py
rename to tests/core/pyspec/eth2spec/test/altair/sanity/__init__.py
diff --git a/tests/core/pyspec/eth2spec/test/lightclient_patch/sanity/test_blocks.py b/tests/core/pyspec/eth2spec/test/altair/sanity/test_blocks.py
similarity index 100%
rename from tests/core/pyspec/eth2spec/test/lightclient_patch/sanity/test_blocks.py
rename to tests/core/pyspec/eth2spec/test/altair/sanity/test_blocks.py