diff --git a/.github/settings.yml b/.github/settings.yml
index 2fddbf0..cc8c0b3 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -16,7 +16,7 @@ branches:
       required_status_checks:
         strict: true
         contexts:
-          - "test"
+          - "Build and Test"
       enforce_admins: false
       required_linear_history: false
       restrictions: null
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c84adde..4740277 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,8 @@ on:
     branches: [main]
 
 jobs:
-  test:
+  build-and-test:
+    name: "Build and Test"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.opencode/agents/divisor-curator.md b/.opencode/agents/divisor-curator.md
index 285db4f..b7c8302 100644
--- a/.opencode/agents/divisor-curator.md
+++ b/.opencode/agents/divisor-curator.md
@@ -79,7 +79,7 @@ Classify files as user-facing or internal based on path patterns:
 - `cmd/` — CLI commands and flags
 - `.opencode/agents/` — agent capabilities
 - `.opencode/commands/` — slash commands
-- `.opencode/skill/` — swarm skills
+- `.opencode/skills/` — swarm skills
 - `internal/scaffold/` — scaffold output (affects what `uf init` deploys)
 - `AGENTS.md` — project documentation
 - `README.md` — project documentation
diff --git a/.opencode/commands/review-council.md b/.opencode/commands/review-council.md
index 9b42703..49f752e 100644
--- a/.opencode/commands/review-council.md
+++ b/.opencode/commands/review-council.md
@@ -55,7 +55,7 @@ examining the current branch and workspace:
    - **Code files**: everything else (`.go`, `.ts`, `.js`,
      `.py`, `go.mod`, `go.sum`, `Makefile`, `internal/`,
      `cmd/`, `.opencode/agents/`, `.opencode/commands/`,
-     `.opencode/skill/`, `.opencode/uf/packs/`,
+     `.opencode/skills/`, `.opencode/uf/packs/`,
      etc.)
 
 4. **Detect the workflow tier** from the branch name:
diff --git a/.opencode/skill/speckit-workflow/SKILL.md b/.opencode/skills/speckit-workflow/SKILL.md
similarity index 100%
rename from .opencode/skill/speckit-workflow/SKILL.md
rename to .opencode/skills/speckit-workflow/SKILL.md