diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index ce5e1f5c4..1d2e158cb 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -18,9 +18,9 @@
       "source": "./plugins/agentv-claude-trace"
     },
     {
-      "name": "agentic-architect",
-      "description": "Design and review AI agent architectures — species selection, workflow patterns, and plugin quality review",
-      "source": "./plugins/agentic-architect"
+      "name": "agentic-engineering",
+      "description": "Design and review AI agent systems — architecture patterns, workflow design, and plugin quality review",
+      "source": "./plugins/agentic-engineering"
     }
   ]
 }
diff --git a/.github/plugin/marketplace.json b/.github/plugin/marketplace.json
index ce5e1f5c4..1d2e158cb 100644
--- a/.github/plugin/marketplace.json
+++ b/.github/plugin/marketplace.json
@@ -18,9 +18,9 @@
       "source": "./plugins/agentv-claude-trace"
     },
     {
-      "name": "agentic-architect",
-      "description": "Design and review AI agent architectures — species selection, workflow patterns, and plugin quality review",
-      "source": "./plugins/agentic-architect"
+      "name": "agentic-engineering",
+      "description": "Design and review AI agent systems — architecture patterns, workflow design, and plugin quality review",
+      "source": "./plugins/agentic-engineering"
     }
   ]
 }
diff --git a/evals/agentic-architect/agent-plugin-review.eval.yaml b/evals/agentic-engineering/agent-plugin-review.eval.yaml
similarity index 100%
rename from evals/agentic-architect/agent-plugin-review.eval.yaml
rename to evals/agentic-engineering/agent-plugin-review.eval.yaml
diff --git a/evals/agentic-architect/workspace-template/evals/deploy-auto/deploy-execute.eval.yaml b/evals/agentic-engineering/workspace-template/evals/deploy-auto/deploy-execute.eval.yaml
similarity index 100%
rename from evals/agentic-architect/workspace-template/evals/deploy-auto/deploy-execute.eval.yaml
rename to evals/agentic-engineering/workspace-template/evals/deploy-auto/deploy-execute.eval.yaml
diff --git a/evals/agentic-architect/workspace-template/evals/deploy-auto/deploy-plan.yaml b/evals/agentic-engineering/workspace-template/evals/deploy-auto/deploy-plan.yaml
similarity index 100%
rename from evals/agentic-architect/workspace-template/evals/deploy-auto/deploy-plan.yaml
rename to evals/agentic-engineering/workspace-template/evals/deploy-auto/deploy-plan.yaml
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/AGENTS.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/AGENTS.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/AGENTS.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/AGENTS.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/commands/deploy-pipeline.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/commands/deploy-pipeline.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/commands/deploy-pipeline.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/commands/deploy-pipeline.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-execute/SKILL.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-execute/SKILL.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-execute/SKILL.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-execute/SKILL.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-execute/references/health-check-patterns.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-execute/references/health-check-patterns.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-execute/references/health-check-patterns.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-execute/references/health-check-patterns.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-plan/SKILL.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-plan/SKILL.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-plan/SKILL.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-plan/SKILL.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-plan/references/deployment-patterns.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-plan/references/deployment-patterns.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-plan/references/deployment-patterns.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-plan/references/deployment-patterns.md
diff --git a/evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-rollback/SKILL.md b/evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-rollback/SKILL.md
similarity index 100%
rename from evals/agentic-architect/workspace-template/plugins/deploy-auto/skills/deploy-rollback/SKILL.md
rename to evals/agentic-engineering/workspace-template/plugins/deploy-auto/skills/deploy-rollback/SKILL.md
diff --git a/plugins/agentic-architect/skills/agent-architecture-design/SKILL.md b/plugins/agentic-engineering/skills/agent-architecture-design/SKILL.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-architecture-design/SKILL.md
rename to plugins/agentic-engineering/skills/agent-architecture-design/SKILL.md
diff --git a/plugins/agentic-architect/skills/agent-architecture-design/references/agentic-design-patterns.md b/plugins/agentic-engineering/skills/agent-architecture-design/references/agentic-design-patterns.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-architecture-design/references/agentic-design-patterns.md
rename to plugins/agentic-engineering/skills/agent-architecture-design/references/agentic-design-patterns.md
diff --git a/plugins/agentic-architect/skills/agent-architecture-design/references/workflow-patterns.md b/plugins/agentic-engineering/skills/agent-architecture-design/references/workflow-patterns.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-architecture-design/references/workflow-patterns.md
rename to plugins/agentic-engineering/skills/agent-architecture-design/references/workflow-patterns.md
diff --git a/plugins/agentic-architect/skills/agent-plugin-review/SKILL.md b/plugins/agentic-engineering/skills/agent-plugin-review/SKILL.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-plugin-review/SKILL.md
rename to plugins/agentic-engineering/skills/agent-plugin-review/SKILL.md
diff --git a/plugins/agentic-architect/skills/agent-plugin-review/references/skill-quality-checklist.md b/plugins/agentic-engineering/skills/agent-plugin-review/references/skill-quality-checklist.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-plugin-review/references/skill-quality-checklist.md
rename to plugins/agentic-engineering/skills/agent-plugin-review/references/skill-quality-checklist.md
diff --git a/plugins/agentic-architect/skills/agent-plugin-review/references/workflow-checklist.md b/plugins/agentic-engineering/skills/agent-plugin-review/references/workflow-checklist.md
similarity index 100%
rename from plugins/agentic-architect/skills/agent-plugin-review/references/workflow-checklist.md
rename to plugins/agentic-engineering/skills/agent-plugin-review/references/workflow-checklist.md
diff --git a/plugins/agentic-architect/skills/agent-plugin-review/scripts/lint_plugin.py b/plugins/agentic-engineering/skills/agent-plugin-review/scripts/lint_plugin.py
similarity index 100%
rename from plugins/agentic-architect/skills/agent-plugin-review/scripts/lint_plugin.py
rename to plugins/agentic-engineering/skills/agent-plugin-review/scripts/lint_plugin.py