diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/SKILL.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
similarity index 97%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/SKILL.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
index d0262ca88..adeda50f7 100644
--- a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/SKILL.md
+++ b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/SKILL.md
@@ -1,6 +1,7 @@
 ---
-name: bmad-bmm-product-brief-preview
+name: bmad-product-brief-preview
 description: Create or update product briefs through guided or autonomous discovery. Use when the user requests to 'create a product brief', 'help me create a project brief', or 'update my product brief'.
+argument-hint: "[optional --create, --edit, --optimize, --distillate, --inputs, --headless] [brief idea]"
 ---
 
 # Create Product Brief
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/artifact-analyzer.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/artifact-analyzer.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/artifact-analyzer.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/artifact-analyzer.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/opportunity-reviewer.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/opportunity-reviewer.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/opportunity-reviewer.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/opportunity-reviewer.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/skeptic-reviewer.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/skeptic-reviewer.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/skeptic-reviewer.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/skeptic-reviewer.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/web-researcher.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/web-researcher.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/agents/web-researcher.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/agents/web-researcher.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/bmad-manifest.json b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/bmad-manifest.json
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/bmad-manifest.json
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/bmad-manifest.json
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/bmad-skill-manifest.yaml b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/bmad-skill-manifest.yaml
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/bmad-skill-manifest.yaml
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/bmad-skill-manifest.yaml
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/contextual-discovery.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/contextual-discovery.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/contextual-discovery.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/contextual-discovery.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/draft-and-review.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/draft-and-review.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/draft-and-review.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/draft-and-review.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/finalize.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/finalize.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/finalize.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/finalize.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/guided-elicitation.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/guided-elicitation.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/prompts/guided-elicitation.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/prompts/guided-elicitation.md
diff --git a/src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/resources/brief-template.md b/src/bmm/workflows/1-analysis/bmad-product-brief-preview/resources/brief-template.md
similarity index 100%
rename from src/bmm/workflows/1-analysis/bmad-bmm-product-brief-preview/resources/brief-template.md
rename to src/bmm/workflows/1-analysis/bmad-product-brief-preview/resources/brief-template.md