diff --git a/src/bmm/workflows/4-implementation/code-review/instructions.xml b/src/bmm/workflows/4-implementation/code-review/instructions.xml
index 0ce1584f4..0d0707599 100644
--- a/src/bmm/workflows/4-implementation/code-review/instructions.xml
+++ b/src/bmm/workflows/4-implementation/code-review/instructions.xml
@@ -29,6 +29,7 @@
          <output>🚫 Error: Project context must only contain alphanumeric characters, dots, dashes, underscores, or slashes.</output>
          <action>HALT</action>
       </check>
+      <action>Override project_name to {project_suffix}</action>
       <action>Override output_folder to {project-root}/_bmad-output/{project_suffix}</action>
     </check>
 
diff --git a/src/core/tasks/workflow.xml b/src/core/tasks/workflow.xml
index 2b5503135..59cac7d3e 100644
--- a/src/core/tasks/workflow.xml
+++ b/src/core/tasks/workflow.xml
@@ -18,8 +18,8 @@
 
   <flow>
     <step n="1" title="Load and Initialize Workflow">
-      <substep n="1a" title="Monorepo Context Injection">
-        {{monorepo_context_logic}}
+      <substep n="1a" title="Initialize Environment Variables">
+        <action>Resolve system variables (date:system-generated) and paths ({project-root}, {installed_path})</action>
       </substep>
 
       <substep n="1b" title="Load Configuration and Resolve Variables">
@@ -27,11 +27,14 @@
         <mandate>Load config_source (REQUIRED for all modules)</mandate>
         <phase n="1">Load external config from config_source path</phase>
         <phase n="2">Resolve all {config_source}: references with values from config</phase>
-        <phase n="3">Resolve system variables (date:system-generated) and paths ({project-root}, {installed_path})</phase>
-        <phase n="4">Ask user for input of any variables that are still unknown</phase>
+        <phase n="3">Ask user for input of any variables that are still unknown</phase>
       </substep>
 
-      <substep n="1c" title="Load Required Components">
+      <substep n="1c" title="Monorepo Context Enforcement">
+        {{monorepo_context_logic}}
+      </substep>
+
+      <substep n="1d" title="Load Required Components">
         <mandate>Instructions: Read COMPLETE file from path OR embedded list (REQUIRED)</mandate>
         <check>If template path → Read COMPLETE template file</check>
         <check>If validation path → Note path for later loading when needed</check>
@@ -39,7 +42,7 @@
         <note>Data files (csv, json) → Store paths only, load on-demand when instructions reference them</note>
       </substep>
 
-      <substep n="1d" title="Initialize Output" if="template-workflow">
+      <substep n="1e" title="Initialize Output" if="template-workflow">
         <action>Resolve default_output_file path with all variables and {{date}}</action>
         <action>Create output directory if doesn't exist</action>
         <action>If template-workflow → Write template to output file with placeholders</action>
diff --git a/src/core/workflows/advanced-elicitation/workflow.xml b/src/core/workflows/advanced-elicitation/workflow.xml
index bca783a09..7764cfd11 100644
--- a/src/core/workflows/advanced-elicitation/workflow.xml
+++ b/src/core/workflows/advanced-elicitation/workflow.xml
@@ -47,6 +47,7 @@
            <action>HALT</action>
         </check>
 
+        <action>Override project_name to {project_suffix}</action>
         <action>Override output_folder to {project-root}/_bmad-output/{project_suffix}</action>
         <action>Override planning_artifacts to {project-root}/_bmad-output/{project_suffix}</action>
         <action>Override implementation_artifacts to {project-root}/_bmad-output/{project_suffix}</action>
diff --git a/tools/cli/installers/lib/ide/shared/context-logic.js b/tools/cli/installers/lib/ide/shared/context-logic.js
index c25751920..cf26a8ff6 100644
--- a/tools/cli/installers/lib/ide/shared/context-logic.js
+++ b/tools/cli/installers/lib/ide/shared/context-logic.js
@@ -36,7 +36,8 @@ const MONOREPO_CONTEXT_LOGIC = `
       <action>HALT</action>
     </check>
 
-    <!-- Step 4: Override path variables -->
+    <!-- Step 4: Override path and identification variables -->
+    <action>Override project_name = {project_suffix}</action>
     <action>Override output_folder = {project-root}/_bmad-output/{project_suffix}</action>
     <action>Override planning_artifacts = {output_folder}/planning-artifacts</action>
     <action>Override implementation_artifacts = {output_folder}/implementation-artifacts</action>