diff --git a/src/bmm/agents/pm.agent.yaml b/src/bmm/agents/pm.agent.yaml
index bf104246a..37bd3a9ca 100644
--- a/src/bmm/agents/pm.agent.yaml
+++ b/src/bmm/agents/pm.agent.yaml
@@ -40,5 +40,5 @@ agent:
description: "[IR] Implementation Readiness: Ensure the PRD, UX, and Architecture and Epics and Stories List are all aligned"
- trigger: CC or fuzzy match on correct-course
- exec: "{project-root}/_bmad/bmm/workflows/4-implementation/correct-course/workflow.md"
+ exec: "{project-root}/_bmad/bmm/workflows/4-implementation/bmad-correct-course/workflow.md"
description: "[CC] Course Correction: Use this so we can determine how to proceed if major need for change is discovered mid implementation"
diff --git a/src/bmm/agents/sm.agent.yaml b/src/bmm/agents/sm.agent.yaml
index ef71f7681..04d582815 100644
--- a/src/bmm/agents/sm.agent.yaml
+++ b/src/bmm/agents/sm.agent.yaml
@@ -33,5 +33,5 @@ agent:
description: "[ER] Epic Retrospective: Party Mode review of all work completed across an epic."
- trigger: CC or fuzzy match on correct-course
- exec: "{project-root}/_bmad/bmm/workflows/4-implementation/correct-course/workflow.md"
+ exec: "{project-root}/_bmad/bmm/workflows/4-implementation/bmad-correct-course/workflow.md"
description: "[CC] Course Correction: Use this so we can determine how to proceed if major need for change is discovered mid implementation"
diff --git a/src/bmm/module-help.csv b/src/bmm/module-help.csv
index aa5fc6dcd..c0877dd4f 100644
--- a/src/bmm/module-help.csv
+++ b/src/bmm/module-help.csv
@@ -4,7 +4,7 @@ bmm,anytime,Generate Project Context,GPC,,_bmad/bmm/workflows/generate-project-c
bmm,anytime,Quick Spec,QS,,_bmad/bmm/workflows/bmad-quick-flow/quick-spec/workflow.md,bmad-bmm-quick-spec,false,quick-flow-solo-dev,Create Mode,"Do not suggest for potentially very complex things unless requested or if the user complains that they do not want to follow the extensive planning of the bmad method. Quick one-off tasks small changes simple apps brownfield additions to well established patterns utilities without extensive planning",planning_artifacts,"tech spec",
bmm,anytime,Quick Dev,QD,,skill:bmad-quick-dev,bmad-bmm-quick-dev,false,quick-flow-solo-dev,Create Mode,"Quick one-off tasks small changes simple apps utilities without extensive planning - Do not suggest for potentially very complex things unless requested or if the user complains that they do not want to follow the extensive planning of the bmad method, unless the user is already working through the implementation phase and just requests a 1 off things not already in the plan",,,
bmm,anytime,Quick Dev New Preview,QQ,,skill:bmad-quick-dev-new-preview,bmad-bmm-quick-dev-new-preview,false,quick-flow-solo-dev,Create Mode,"Unified quick flow (experimental): clarify intent plan implement review and present in a single workflow",implementation_artifacts,"tech spec implementation",
-bmm,anytime,Correct Course,CC,,_bmad/bmm/workflows/4-implementation/correct-course/workflow.md,bmad-bmm-correct-course,false,sm,Create Mode,"Anytime: Navigate significant changes. May recommend start over update PRD redo architecture sprint planning or correct epics and stories",planning_artifacts,"change proposal",
+bmm,anytime,Correct Course,CC,,skill:bmad-correct-course,bmad-bmm-correct-course,false,sm,Create Mode,"Anytime: Navigate significant changes. May recommend start over update PRD redo architecture sprint planning or correct epics and stories",planning_artifacts,"change proposal",
bmm,anytime,Write Document,WD,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Describe in detail what you want, and the agent will follow the documentation best practices defined in agent memory. Multi-turn conversation with subprocess for research/review.",project-knowledge,"document",
bmm,anytime,Update Standards,US,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Update agent memory documentation-standards.md with your specific preferences if you discover missing document conventions.",_bmad/_memory/tech-writer-sidecar,"standards",
bmm,anytime,Mermaid Generate,MG,,_bmad/bmm/agents/tech-writer/tech-writer.agent.yaml,,false,tech-writer,,"Create a Mermaid diagram based on user description. Will suggest diagram types if not specified.",planning_artifacts,"mermaid diagram",
diff --git a/src/bmm/workflows/4-implementation/bmad-correct-course/SKILL.md b/src/bmm/workflows/4-implementation/bmad-correct-course/SKILL.md
new file mode 100644
index 000000000..fe2501552
--- /dev/null
+++ b/src/bmm/workflows/4-implementation/bmad-correct-course/SKILL.md
@@ -0,0 +1,6 @@
+---
+name: bmad-correct-course
+description: 'Manage significant changes during sprint execution. Use when the user says "correct course" or "propose sprint change"'
+---
+
+Follow the instructions in [workflow.md](workflow.md).
diff --git a/src/bmm/workflows/4-implementation/bmad-correct-course/bmad-skill-manifest.yaml b/src/bmm/workflows/4-implementation/bmad-correct-course/bmad-skill-manifest.yaml
new file mode 100644
index 000000000..d0f08abdb
--- /dev/null
+++ b/src/bmm/workflows/4-implementation/bmad-correct-course/bmad-skill-manifest.yaml
@@ -0,0 +1 @@
+type: skill
diff --git a/src/bmm/workflows/4-implementation/correct-course/checklist.md b/src/bmm/workflows/4-implementation/bmad-correct-course/checklist.md
similarity index 98%
rename from src/bmm/workflows/4-implementation/correct-course/checklist.md
rename to src/bmm/workflows/4-implementation/bmad-correct-course/checklist.md
index 1e630ccbb..6fb7c3edd 100644
--- a/src/bmm/workflows/4-implementation/correct-course/checklist.md
+++ b/src/bmm/workflows/4-implementation/bmad-correct-course/checklist.md
@@ -1,6 +1,6 @@
# Change Navigation Checklist
-This checklist is executed as part of: {project-root}/_bmad/bmm/workflows/4-implementation/correct-course/workflow.md
+This checklist is executed as part of: ./workflow.md
Work through each section systematically with the user, recording findings and impacts
diff --git a/src/bmm/workflows/4-implementation/correct-course/workflow.md b/src/bmm/workflows/4-implementation/bmad-correct-course/workflow.md
similarity index 99%
rename from src/bmm/workflows/4-implementation/correct-course/workflow.md
rename to src/bmm/workflows/4-implementation/bmad-correct-course/workflow.md
index e95ec8432..b9631ff0c 100644
--- a/src/bmm/workflows/4-implementation/correct-course/workflow.md
+++ b/src/bmm/workflows/4-implementation/bmad-correct-course/workflow.md
@@ -1,5 +1,5 @@
---
-name: correct-course
+name: bmad-correct-course
description: 'Manage significant changes during sprint execution. Use when the user says "correct course" or "propose sprint change"'
---
@@ -31,7 +31,7 @@ Load config from `{project-root}/_bmad/bmm/config.yaml` and resolve:
### Paths
-- `installed_path` = `{project-root}/_bmad/bmm/workflows/4-implementation/correct-course`
+- `installed_path` = `.`
- `checklist` = `{installed_path}/checklist.md`
- `default_output_file` = `{planning_artifacts}/sprint-change-proposal-{date}.md`
diff --git a/src/bmm/workflows/4-implementation/correct-course/bmad-skill-manifest.yaml b/src/bmm/workflows/4-implementation/correct-course/bmad-skill-manifest.yaml
deleted file mode 100644
index 6a95bd4a7..000000000
--- a/src/bmm/workflows/4-implementation/correct-course/bmad-skill-manifest.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-canonicalId: bmad-correct-course
-type: workflow
-description: "Manage significant changes during sprint execution"