diff --git a/.claude/skills/changelog-social/SKILL.md b/.claude/skills/bmad-os-changelog-social/SKILL.md
similarity index 100%
rename from .claude/skills/changelog-social/SKILL.md
rename to .claude/skills/bmad-os-changelog-social/SKILL.md
diff --git a/.claude/skills/changelog-social/examples/discord-example.md b/.claude/skills/bmad-os-changelog-social/examples/discord-example.md
similarity index 100%
rename from .claude/skills/changelog-social/examples/discord-example.md
rename to .claude/skills/bmad-os-changelog-social/examples/discord-example.md
diff --git a/.claude/skills/changelog-social/examples/linkedin-example.md b/.claude/skills/bmad-os-changelog-social/examples/linkedin-example.md
similarity index 100%
rename from .claude/skills/changelog-social/examples/linkedin-example.md
rename to .claude/skills/bmad-os-changelog-social/examples/linkedin-example.md
diff --git a/.claude/skills/changelog-social/examples/twitter-example.md b/.claude/skills/bmad-os-changelog-social/examples/twitter-example.md
similarity index 100%
rename from .claude/skills/changelog-social/examples/twitter-example.md
rename to .claude/skills/bmad-os-changelog-social/examples/twitter-example.md
diff --git a/.claude/skills/draft-changelog/SKILL.md b/.claude/skills/bmad-os-draft-changelog/SKILL.md
similarity index 100%
rename from .claude/skills/draft-changelog/SKILL.md
rename to .claude/skills/bmad-os-draft-changelog/SKILL.md
diff --git a/.claude/skills/draft-changelog/prompts/instructions.md b/.claude/skills/bmad-os-draft-changelog/prompts/instructions.md
similarity index 100%
rename from .claude/skills/draft-changelog/prompts/instructions.md
rename to .claude/skills/bmad-os-draft-changelog/prompts/instructions.md
diff --git a/.claude/skills/gh-triage/README.md b/.claude/skills/bmad-os-gh-triage/README.md
similarity index 100%
rename from .claude/skills/gh-triage/README.md
rename to .claude/skills/bmad-os-gh-triage/README.md
diff --git a/.claude/skills/gh-triage/SKILL.md b/.claude/skills/bmad-os-gh-triage/SKILL.md
similarity index 100%
rename from .claude/skills/gh-triage/SKILL.md
rename to .claude/skills/bmad-os-gh-triage/SKILL.md
diff --git a/.claude/skills/gh-triage/prompts/agent-prompt.md b/.claude/skills/bmad-os-gh-triage/prompts/agent-prompt.md
similarity index 100%
rename from .claude/skills/gh-triage/prompts/agent-prompt.md
rename to .claude/skills/bmad-os-gh-triage/prompts/agent-prompt.md
diff --git a/.claude/skills/gh-triage/prompts/instructions.md b/.claude/skills/bmad-os-gh-triage/prompts/instructions.md
similarity index 100%
rename from .claude/skills/gh-triage/prompts/instructions.md
rename to .claude/skills/bmad-os-gh-triage/prompts/instructions.md
diff --git a/.claude/skills/release-module/README.md b/.claude/skills/bmad-os-release-module/README.md
similarity index 100%
rename from .claude/skills/release-module/README.md
rename to .claude/skills/bmad-os-release-module/README.md
diff --git a/.claude/skills/release-module/SKILL.md b/.claude/skills/bmad-os-release-module/SKILL.md
similarity index 100%
rename from .claude/skills/release-module/SKILL.md
rename to .claude/skills/bmad-os-release-module/SKILL.md
diff --git a/.claude/skills/release-module/prompts/instructions.md b/.claude/skills/bmad-os-release-module/prompts/instructions.md
similarity index 100%
rename from .claude/skills/release-module/prompts/instructions.md
rename to .claude/skills/bmad-os-release-module/prompts/instructions.md