diff --git a/definitions/create-expert/perstack.toml b/definitions/create-expert/perstack.toml
index bb94ec80..371ddd09 100644
--- a/definitions/create-expert/perstack.toml
+++ b/definitions/create-expert/perstack.toml
@@ -86,7 +86,7 @@
 
 [experts."create-expert"]
 defaultModelTier = "high"
-version = "1.0.15"
+version = "1.0.16"
 description = "Creates and modifies Perstack expert definitions in perstack.toml"
 instruction = """
 You are the coordinator for creating and modifying Perstack expert definitions. perstack.toml is the single source of truth — your job is to produce or modify it according to the user's request.
@@ -131,7 +131,7 @@ pick = ["readTextFile", "exec", "attemptCompletion"]
 
 [experts."@create-expert/plan"]
 defaultModelTier = "high"
-version = "1.0.15"
+version = "1.0.16"
 description = """
 Analyzes the user's request and produces plan.md: domain constraints, test query, verification signals, and role architecture.
 Provide: (1) what the expert should do, (2) path to existing perstack.toml if one exists.
@@ -174,10 +174,27 @@ Every domain constraint from the Domain Knowledge section must be covered by at
 If a criterion cannot be expressed as a command with a deterministic expected result, rethink the criterion or the artifact design until it can.
 
 ### Architecture
-Delegation tree with role assignments. Include one verifier expert that executes the hard signal checks defined in Verification Signals — the generator and the verifier share no context (context separation). The verifier is a single expert with exec capability, direct child of the coordinator, not nested under an executor.
+Delegation tree with role assignments.
+
+Naming rules:
+- Coordinator: if the user specified a team name, use it exactly — no "-coordinator", "-main", or other suffixes.
+- Delegates: `@coordinator-name/verb-or-function` — name by what they do, not who they are. Use `/test`, `/verify`, `/plan`, `/build`, `/write`, not `/tester`, `/coder`, `/designer`. The name should be self-explanatory at a glance.
+
+Include one verifier expert that executes the hard signal checks defined in Verification Signals — the generator and the verifier share no context (context separation). The verifier is a single expert with exec capability, direct child of the coordinator, not nested under an executor.
 
 For each expert, write ONLY: name, one-line purpose, and role (executor or verifier). Do not write deliverables, constraints, or implementation details — that is write-definition's job.
 
+## Self-Check Before Finalizing
+
+Re-read plan.md and verify each rule. If any check fails, fix plan.md before attemptCompletion.
+
+1. **Section names exact match**: plan.md uses exactly these section names and no others — "Expert Purpose", "Domain Knowledge", "Use Cases", "Test Query", "Verification Signals", "Architecture". Extra sections confuse downstream experts.
+2. **Single test query**: "Test Query" section contains exactly one query, not multiple.
+3. **Every signal is a command**: each entry in "Verification Signals" specifies a concrete command to execute and its expected result. Entries that describe what to observe or what correct output "looks like" without a command are not signals — rewrite them.
+4. **No soft language in signals**: signals contain no phrases like "verify that", "check that", "should be", "looks correct", "works properly". Each signal is: run X → expect Y.
+5. **Domain constraint coverage**: every constraint in "Domain Knowledge" is exercised by at least one signal. List which signal covers which constraint.
+6. **Architecture is names only**: "Architecture" section contains expert name, one-line purpose, and role (executor/verifier) per expert. No deliverables, no constraints, no implementation details.
+
 After writing plan.md, attemptCompletion with the file path.
 """
 
@@ -201,7 +218,7 @@ pick = [
 
 [experts."@create-expert/build"]
 defaultModelTier = "low"
-version = "1.0.15"
+version = "1.0.16"
 description = """
 Orchestrates the write → test → verify cycle for perstack.toml.
 Provide: path to plan.md (containing requirements, architecture, test query, and verification signals).
@@ -255,7 +272,7 @@ pick = ["readTextFile", "exec", "todo", "attemptCompletion"]
 
 [experts."@create-expert/write-definition"]
 defaultModelTier = "low"
-version = "1.0.15"
+version = "1.0.16"
 description = """
 Writes or modifies a perstack.toml definition from plan.md requirements and architecture.
 Provide: (1) path to plan.md, (2) optionally path to existing perstack.toml to preserve, (3) optionally feedback from a failed test to address.
@@ -379,7 +396,7 @@ pick = [
 
 [experts."@create-expert/verify-test"]
 defaultModelTier = "low"
-version = "1.0.15"
+version = "1.0.16"
 description = """
 Executes hard signal checks against test-expert's results, verifies their reproducibility, and checks the definition structure.
 Provide: (1) the test-expert's factual report (query, what was produced, errors), (2) the verification signals from plan.md, (3) path to perstack.toml.
@@ -442,7 +459,7 @@ pick = ["readTextFile", "exec", "todo", "attemptCompletion"]
 
 [experts."@create-expert/test-expert"]
 defaultModelTier = "low"
-version = "1.0.15"
+version = "1.0.16"
 description = """
 Executes a single test query against a Perstack expert definition and reports what happened.
 Provide: (1) path to perstack.toml, (2) the test query to execute, (3) the coordinator expert name to test.