diff --git a/.claude/skills/release/SKILL.md b/.claude/skills/cf-temp-mail-release/SKILL.md
similarity index 98%
rename from .claude/skills/release/SKILL.md
rename to .claude/skills/cf-temp-mail-release/SKILL.md
index ed357f63..271816d1 100644
--- a/.claude/skills/release/SKILL.md
+++ b/.claude/skills/cf-temp-mail-release/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: release
+name: cf-temp-mail-release
 description: Create a GitHub release for cloudflare_temp_email project. Use when the user asks to create a release, publish a version, tag a release, or make a new release. Reads CHANGELOG.md for release content, collects merged PRs via `gh` CLI, and creates a properly formatted GitHub release.
 ---
 
diff --git a/.claude/skills/release/references/release-template.md b/.claude/skills/cf-temp-mail-release/references/release-template.md
similarity index 100%
rename from .claude/skills/release/references/release-template.md
rename to .claude/skills/cf-temp-mail-release/references/release-template.md
diff --git a/.claude/skills/upgrade-dependencies/SKILL.md b/.claude/skills/cf-temp-mail-upgrade-dependencies/SKILL.md
similarity index 97%
rename from .claude/skills/upgrade-dependencies/SKILL.md
rename to .claude/skills/cf-temp-mail-upgrade-dependencies/SKILL.md
index ec765de7..80327e95 100644
--- a/.claude/skills/upgrade-dependencies/SKILL.md
+++ b/.claude/skills/cf-temp-mail-upgrade-dependencies/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: upgrade-dependencies
+name: cf-temp-mail-upgrade-dependencies
 description: Upgrade npm dependencies across all sub-packages of the project. Use when the user asks to upgrade/update dependencies, bump deps, refresh lockfiles, or update wrangler. Runs pnpm upgrades on frontend/, worker/, pages/, and vitepress-docs/.
 ---
 
diff --git a/.claude/skills/version-upgrade/SKILL.md b/.claude/skills/cf-temp-mail-version-upgrade/SKILL.md
similarity index 97%
rename from .claude/skills/version-upgrade/SKILL.md
rename to .claude/skills/cf-temp-mail-version-upgrade/SKILL.md
index 907adee9..d7ef7918 100644
--- a/.claude/skills/version-upgrade/SKILL.md
+++ b/.claude/skills/cf-temp-mail-version-upgrade/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: version-upgrade
+name: cf-temp-mail-version-upgrade
 description: Upgrade the project version number. Use when the user asks to bump the version, upgrade the version, or prepare a new release version. Supports major, minor, and patch upgrades.
 ---