diff --git a/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md b/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
index 9134a6d..7a94c76 100644
--- a/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
+++ b/skills/bmad-module-builder/assets/setup-skill-template/SKILL.md
@@ -1,5 +1,5 @@
 ---
-name: { setup-skill-name }
+name: "{setup-skill-name}"
 description: Sets up {module-name} module in a project. Use when the user requests to 'install {module-code} module', 'configure {module-name}', or 'setup {module-name}'.
 ---
 
diff --git a/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py b/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
index 577ac76..6cd60b8 100644
--- a/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
+++ b/skills/bmad-module-builder/scripts/tests/test-scaffold-setup-skill.py
@@ -95,6 +95,12 @@ def test_skill_md_frontmatter_substitution():
         assert "{module-code}" not in skill_md
 
 
+def test_template_frontmatter_uses_quoted_name_placeholder():
+    """Test that the template frontmatter is valid before substitution."""
+    template_skill_md = (TEMPLATE_DIR / "SKILL.md").read_text()
+    assert 'name: "{setup-skill-name}"' in template_skill_md
+
+
 def test_generated_files_written():
     """Test that module.yaml and module-help.csv contain generated content."""
     with tempfile.TemporaryDirectory() as tmp:
@@ -201,6 +207,7 @@ def test_missing_source_file():
     tests = [
         test_basic_scaffold,
         test_skill_md_frontmatter_substitution,
+        test_template_frontmatter_uses_quoted_name_placeholder,
         test_generated_files_written,
         test_anti_zombie_replaces_existing,
         test_missing_target_dir,