@@ -52,7 +52,7 @@ training/megatron-fsdp.md
 training/resiliency.md
 training/mixed-precision.md
 training/cuda-graphs.md
-training/hybrid-context-parallel.md
+training/hierarchical-context-parallel.md
 training/communication-overlap.md
 training/attention-optimizations.md
 training/activation-recomputation.md
 
@@ -41,7 +41,7 @@ This directory contains comprehensive documentation for training and customizing
 | **[Optimizer & Scheduler](optimizer-scheduler.md)** | Optimizer and learning rate scheduler configuration | Setting up optimization |
 | **[Mixed Precision](mixed-precision.md)** | Mixed precision training for memory efficiency | Reducing memory usage |
 | **[Communication Overlap](communication-overlap.md)** | Overlapping communication with computation | Optimizing distributed training |
-| **[Hybrid Context Parallel](hybrid-context-parallel.md)** | Hierarchical `a2a+p2p` context parallel guidance | Advanced long-sequence scaling |
+| **[Hierarchical Context Parallel](hierarchical-context-parallel.md)** | Hierarchical `a2a+p2p` context parallel guidance | Advanced long-sequence scaling |
 | **[Attention Optimizations](attention-optimizations.md)** | Optimizing attention mechanisms | Improving training speed |
 | **[Activation Recomputation](activation-recomputation.md)** | Gradient checkpointing strategies | Reducing memory footprint |
 | **[CPU Offloading](cpu-offloading.md)** | Offloading to CPU for memory management | Working with limited GPU memory |
 
@@ -157,7 +157,7 @@ correct question is always "which communication path is exposed in this run?"
 
 - [docs/performance-guide.md](../performance-guide.md)
 - [docs/training/cuda-graphs.md](cuda-graphs.md)
-- [docs/training/hybrid-context-parallel.md](hybrid-context-parallel.md)
+- [docs/training/hierarchical-context-parallel.md](hierarchical-context-parallel.md)
 - [skills/perf-tp-dp-comm-overlap/SKILL.md](../skills/perf-tp-dp-comm-overlap/SKILL.md)
 - [skills/perf-expert-parallel-overlap/SKILL.md](../skills/perf-expert-parallel-overlap/SKILL.md)
 - [skills/perf-moe-comm-overlap/SKILL.md](../skills/perf-moe-comm-overlap/SKILL.md)
 
@@ -1,11 +1,11 @@
-# Hybrid / Hierarchical Context Parallel
+# Hierarchical Context Parallel
 
-This page covers the stable Bridge-facing meaning of hierarchical context
-parallelism, especially the `a2a+p2p` transport path and
+This page covers hierarchical context parallelism in Megatron Bridge,
+especially the `a2a+p2p` transport path and
 `hierarchical_context_parallel_sizes`.
 
 For operational setup, code anchors, and verification commands, see
-[skills/perf-hybrid-context-parallel/SKILL.md](../skills/perf-hybrid-context-parallel/SKILL.md).
+[the hierarchical CP skill](../skills/perf-hybrid-context-parallel/SKILL.md).
 
 ## What It Is
 
@@ -24,11 +24,6 @@ several CP communication backends:
 a2a (fast, head-parallel) on intra-node links with p2p (async,
 sequence-parallel) on inter-node links.
 
-It is important to separate this from the upstream boolean
-`hybrid_context_parallel`, which is a different feature for balancing packed or
-variable-length workloads. The two concepts should not be treated as
-interchangeable.
-
 ### Why a2a is limited by KV heads
 
 a2a transposes the parallelism dimension: each rank trades its sequence chunk
@@ -109,5 +104,5 @@ all Bridge initialization modes.
 
 - [docs/performance-guide.md](../performance-guide.md)
 - [docs/training/communication-overlap.md](communication-overlap.md)
-- [skills/perf-hybrid-context-parallel/SKILL.md](../skills/perf-hybrid-context-parallel/SKILL.md)
-- [skills/perf-hybrid-context-parallel/card.yaml](../skills/perf-hybrid-context-parallel/card.yaml)
+- [Hierarchical CP skill](../skills/perf-hybrid-context-parallel/SKILL.md)
+- [Hierarchical CP skill card](../skills/perf-hybrid-context-parallel/card.yaml)
@@ -73,7 +73,7 @@ problems:
 For long-sequence training guidance, see:
 
 - `docs/performance-guide.md`
-- `docs/training/hybrid-context-parallel.md`
+- `docs/training/hierarchical-context-parallel.md`
 
 ## Practical Caveats
 
@@ -89,6 +89,6 @@ The most stable caveats to remember are:
 
 - [docs/training/multi-token-prediction.md](multi-token-prediction.md)
 - [docs/performance-guide.md](../performance-guide.md)
-- [docs/training/hybrid-context-parallel.md](hybrid-context-parallel.md)
+- [docs/training/hierarchical-context-parallel.md](hierarchical-context-parallel.md)
 - [skills/perf-sequence-packing/SKILL.md](../skills/perf-sequence-packing/SKILL.md)
 - [skills/perf-sequence-packing/card.yaml](../skills/perf-sequence-packing/card.yaml)
@@ -8,13 +8,12 @@ when_to_use: Scaling context parallelism beyond KV heads, or investigating a com
 
 This skill covers hierarchical context parallelism: nested context-parallel process
 groups used by `cp_comm_type="a2a+p2p"` and configured with
-`hierarchical_context_parallel_sizes`. Some file paths still contain `hybrid`
-as legacy naming; the feature described here is hierarchical CP.
+`hierarchical_context_parallel_sizes`.
 
 For what hierarchical CP is, when to use it, and the decision tree
 (`a2a+p2p` vs pure `a2a` vs `p2p`), see:
 
-- @docs/training/hybrid-context-parallel.md
+- @docs/training/hierarchical-context-parallel.md
 - @skills/perf-hybrid-context-parallel/card.yaml
 
 ## Enablement
 
@@ -1,4 +1,4 @@
-title: hybrid_context_parallel
+title: hierarchical_context_parallel
 validated_on: "2026-03-14"
 summary: >
   Megatron-Bridge currently supports hierarchical context parallelism
@@ -27,9 +27,9 @@ feature_meaning:
   hierarchical_context_parallel_sizes: >
     Per-level subgroup sizes for hierarchical context parallelism. The product
     must equal context_parallel_size.
-  hybrid_context_parallel_flag: >
-    Separate upstream feature for balancing packed or variable-length workloads.
-    It is not the same feature as a2a+p2p.
+  inner_outer_cp_groups: >
+    Hierarchical CP creates inner and outer context-parallel groups. With
+    a2a+p2p, the inner group uses a2a and the outer group uses p2p.
 recommended_path:
   model.context_parallel_size: 4
   model.cp_comm_type: a2a+p2p
@@ -47,7 +47,6 @@ known_limitations:
   - The decentralized-PG path initializes flat CP groups and leaves HCP unset.
   - No checked-in Bridge recipe sets cp_comm_type=a2a+p2p.
   - No checked-in Bridge functional test runs an end-to-end HCP training step.
-  - Bridge docs do not currently call out the decentralized-PG limitation.
 evidence:
   - src/megatron/bridge/training/initialize.py
   - src/megatron/bridge/training/config.py
 
@@ -62,7 +62,7 @@ evidence:
   - docs/parallelisms.md
   - docs/performance-guide.md
   - docs/training/communication-overlap.md
-  - docs/training/hybrid-context-parallel.md
+  - docs/training/hierarchical-context-parallel.md
   - src/megatron/bridge/training/initialize.py
   - src/megatron/bridge/training/config.py
   - src/megatron/bridge/models/common/unimodal.py
 
@@ -67,7 +67,7 @@ evidence:
   - docs/performance-guide.md
   - docs/training/multi-token-prediction.md
   - docs/models/llm/llama3.md
-  - docs/training/hybrid-context-parallel.md
+  - docs/training/hierarchical-context-parallel.md
   - src/megatron/bridge/data/datasets/packed_sequence.py
   - src/megatron/bridge/data/datasets/sft.py
   - src/megatron/bridge/training/utils/packed_seq_utils.py