diff --git a/bmad-core/templates/brownfield-architecture-tmpl.yaml b/bmad-core/templates/brownfield-architecture-tmpl.yaml
index 259c6161..c24f89ab 100644
--- a/bmad-core/templates/brownfield-architecture-tmpl.yaml
+++ b/bmad-core/templates/brownfield-architecture-tmpl.yaml
@@ -109,8 +109,8 @@ sections:
           - **UI/UX Consistency:** {{ui_compatibility}}
           - **Performance Impact:** {{performance_constraints}}
 
-  - id: tech-stack-alignment
-    title: Tech Stack Alignment
+  - id: tech-stack
+    title: Tech Stack
     instruction: |
       Ensure new components align with existing technology choices:
 
@@ -272,8 +272,8 @@ sections:
 
           **Error Handling:** {{error_handling_strategy}}
 
-  - id: source-tree-integration
-    title: Source Tree Integration
+  - id: source-tree
+    title: Source Tree
     instruction: |
       Define how new code will integrate with existing project structure:
 
@@ -342,7 +342,7 @@ sections:
           **Monitoring:** {{monitoring_approach}}
 
   - id: coding-standards
-    title: Coding Standards and Conventions
+    title: Coding Standards
     instruction: |
       Ensure new code follows existing project conventions: