diff --git a/packer/README.md b/packer/README.md
index 4b27d41..8ccda7f 100644
--- a/packer/README.md
+++ b/packer/README.md
@@ -4,7 +4,7 @@ Agent skills for building machine images with Packer and HCP Packer.
 
 ## Plugins
 
-### packer-builders
+### build-machine-image
 
 Skills for building images on AWS, Azure, and Windows.
 
@@ -14,7 +14,7 @@ Skills for building images on AWS, Azure, and Windows.
 | azure-image-builder | Build Azure managed images and Azure Compute Gallery images |
 | windows-builder     | Platform-agnostic Windows image patterns with WinRM and PowerShell |
 
-### packer-hcp
+### publish-metadata-to-hcp
 
 Skills for HCP Packer registry integration.
 
@@ -29,33 +29,33 @@ Skills for HCP Packer registry integration.
 ```bash
 claude plugin marketplace add hashicorp/agent-skills
 
-claude plugin install packer-builders@hashicorp
-claude plugin install packer-hcp@hashicorp
+claude plugin install packer-build-machine-image@hashicorp
+claude plugin install packer-publish-metadata-to-hcp@hashicorp
 ```
 
 ### Individual Skills
 
 ```bash
-# Builders
-npx skills add hashicorp/agent-skills/packer/builders/skills/aws-ami-builder
-npx skills add hashicorp/agent-skills/packer/builders/skills/azure-image-builder
-npx skills add hashicorp/agent-skills/packer/builders/skills/windows-builder
+# Build machine image
+npx skills add hashicorp/agent-skills/packer/build-machine-image/skills/aws-ami-builder
+npx skills add hashicorp/agent-skills/packer/build-machine-image/skills/azure-image-builder
+npx skills add hashicorp/agent-skills/packer/build-machine-image/skills/windows-builder
 
-# HCP Packer
-npx skills add hashicorp/agent-skills/packer/hcp/skills/push-to-registry
+# Publish metadata to HCP
+npx skills add hashicorp/agent-skills/packer/publish-metadata-to-hcp/skills/push-to-registry
 ```
 
 ## Structure
 
 ```
 packer/
-├── builders/
+├── build-machine-image/
 │   ├── .claude-plugin/plugin.json
 │   └── skills/
 │       ├── aws-ami-builder/
 │       ├── azure-image-builder/
 │       └── windows-builder/
-└── hcp/
+└── publish-metadata-to-hcp/
     ├── .claude-plugin/plugin.json
     └── skills/
         └── push-to-registry/
diff --git a/packer/builders/.claude-plugin/plugin.json b/packer/build-machine-image/.claude-plugin/plugin.json
similarity index 58%
rename from packer/builders/.claude-plugin/plugin.json
rename to packer/build-machine-image/.claude-plugin/plugin.json
index 219f314..1f7ed94 100644
--- a/packer/builders/.claude-plugin/plugin.json
+++ b/packer/build-machine-image/.claude-plugin/plugin.json
@@ -1,12 +1,12 @@
 {
-  "name": "packer-builders",
+  "name": "packer-build-machine-image",
   "version": "1.0.0",
-  "description": "Packer builder skills for AWS, Azure, and Windows image creation.",
+  "description": "Packer skills for building machine images on AWS, Azure, and Windows.",
   "author": {
     "name": "HashiCorp",
     "url": "https://github.com/hashicorp"
   },
-  "homepage": "https://developer.hashicorp.com/packer",
+  "homepage": "https://developer.hashicorp.com/packer/tutorials",
   "repository": "https://github.com/hashicorp/agent-skills",
   "license": "MPL-2.0",
   "keywords": ["packer", "aws", "azure", "windows", "ami", "image", "builder"]
diff --git a/packer/builders/skills/aws-ami-builder/SKILL.md b/packer/build-machine-image/skills/aws-ami-builder/SKILL.md
similarity index 100%
rename from packer/builders/skills/aws-ami-builder/SKILL.md
rename to packer/build-machine-image/skills/aws-ami-builder/SKILL.md
diff --git a/packer/builders/skills/azure-image-builder/SKILL.md b/packer/build-machine-image/skills/azure-image-builder/SKILL.md
similarity index 100%
rename from packer/builders/skills/azure-image-builder/SKILL.md
rename to packer/build-machine-image/skills/azure-image-builder/SKILL.md
diff --git a/packer/builders/skills/windows-builder/SKILL.md b/packer/build-machine-image/skills/windows-builder/SKILL.md
similarity index 100%
rename from packer/builders/skills/windows-builder/SKILL.md
rename to packer/build-machine-image/skills/windows-builder/SKILL.md
diff --git a/packer/hcp/.claude-plugin/plugin.json b/packer/publish-metadata-to-hcp/.claude-plugin/plugin.json
similarity index 70%
rename from packer/hcp/.claude-plugin/plugin.json
rename to packer/publish-metadata-to-hcp/.claude-plugin/plugin.json
index 9c83495..96f4a0a 100644
--- a/packer/hcp/.claude-plugin/plugin.json
+++ b/packer/publish-metadata-to-hcp/.claude-plugin/plugin.json
@@ -1,12 +1,12 @@
 {
-  "name": "packer-hcp",
+  "name": "packer-publish-metadata-to-hcp",
   "version": "1.0.0",
   "description": "HCP Packer registry integration for tracking and managing image metadata.",
   "author": {
     "name": "HashiCorp",
     "url": "https://github.com/hashicorp"
   },
-  "homepage": "https://developer.hashicorp.com/hcp/docs/packer",
+  "homepage": "https://developer.hashicorp.com/packer/tutorials/hcp-get-started/hcp-push-artifact-metadata",
   "repository": "https://github.com/hashicorp/agent-skills",
   "license": "MPL-2.0",
   "keywords": ["packer", "hcp-packer", "registry", "metadata", "image-tracking"]
diff --git a/packer/hcp/skills/push-to-registry/SKILL.md b/packer/publish-metadata-to-hcp/skills/push-to-registry/SKILL.md
similarity index 100%
rename from packer/hcp/skills/push-to-registry/SKILL.md
rename to packer/publish-metadata-to-hcp/skills/push-to-registry/SKILL.md