diff --git a/Makefile b/Makefile
index ee3b4095f..17aac0cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,7 @@ GENERATOR_VENVS = $(patsubst $(GENERATOR_DIR)/%, $(GENERATOR_DIR)/%venv, $(GENER
 
 MARKDOWN_FILES = $(wildcard $(SPEC_DIR)/phase0/*.md) $(wildcard $(SPEC_DIR)/altair/*.md) $(wildcard $(SSZ_DIR)/*.md) \
                  $(wildcard $(SPEC_DIR)/bellatrix/*.md) \
+                 $(wildcard $(SPEC_DIR)/capella/*.md) \
                  $(wildcard $(SPEC_DIR)/custody/*.md) \
                  $(wildcard $(SPEC_DIR)/das/*.md) \
                  $(wildcard $(SPEC_DIR)/sharding/*.md) \
diff --git a/specs/capella/beacon-chain.md b/specs/capella/beacon-chain.md
index eff3db7b7..81a7c1707 100644
--- a/specs/capella/beacon-chain.md
+++ b/specs/capella/beacon-chain.md
@@ -6,6 +6,33 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [Introduction](#introduction)
+- [Custom types](#custom-types)
+- [Constants](#constants)
+- [Preset](#preset)
+  - [State list lengths](#state-list-lengths)
+  - [Execution](#execution)
+- [Configuration](#configuration)
+- [Containers](#containers)
+  - [New containers](#new-containers)
+    - [`Withdrawal`](#withdrawal)
+  - [Extended Containers](#extended-containers)
+    - [`ExecutionPayload`](#executionpayload)
+    - [`ExecutionPayloadHeader`](#executionpayloadheader)
+    - [`Validator`](#validator)
+    - [`BeaconState`](#beaconstate)
+- [Helpers](#helpers)
+  - [Beacon state mutators](#beacon-state-mutators)
+    - [`withdraw`](#withdraw)
+  - [Predicates](#predicates)
+    - [`is_fully_withdrawable_validator`](#is_fully_withdrawable_validator)
+- [Beacon chain state transition function](#beacon-chain-state-transition-function)
+  - [Epoch processing](#epoch-processing)
+    - [Withdrawals](#withdrawals)
+  - [Block processing](#block-processing)
+    - [New `process_withdrawals`](#new-process_withdrawals)
+    - [Modified `process_execution_payload`](#modified-process_execution_payload)
+
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
 
diff --git a/specs/capella/fork-choice.md b/specs/capella/fork-choice.md
index 47acf2cfb..f7a76275d 100644
--- a/specs/capella/fork-choice.md
+++ b/specs/capella/fork-choice.md
@@ -7,6 +7,14 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [Introduction](#introduction)
+- [Custom types](#custom-types)
+- [Protocols](#protocols)
+  - [`ExecutionEngine`](#executionengine)
+    - [`notify_forkchoice_updated`](#notify_forkchoice_updated)
+- [Helpers](#helpers)
+  - [Extended `PayloadAttributes`](#extended-payloadattributes)
+
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 <!-- /TOC -->
 
diff --git a/specs/capella/fork.md b/specs/capella/fork.md
index c0363727d..5f015a4ff 100644
--- a/specs/capella/fork.md
+++ b/specs/capella/fork.md
@@ -5,6 +5,12 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
+- [Introduction](#introduction)
+- [Configuration](#configuration)
+- [Fork to Capella](#fork-to-capella)
+  - [Fork trigger](#fork-trigger)
+  - [Upgrading the state](#upgrading-the-state)
+
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 ## Introduction
diff --git a/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py b/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
index eb85da8bb..41975904f 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/capella/fork.py
@@ -50,7 +50,7 @@ def run_fork_test(post_spec, pre_state):
         ]
         for field in stable_validator_fields:
             assert getattr(pre_validator, field) == getattr(post_validator, field)
-        assert post_validator.withdrawn_epoch == post_spec.FAR_FUTURE_EPOCH
+        assert post_validator.fully_withdrawn_epoch == post_spec.FAR_FUTURE_EPOCH
 
     assert pre_state.fork.current_version == post_state.fork.previous_version
     assert post_state.fork.current_version == post_spec.config.CAPELLA_FORK_VERSION