diff --git a/.claude/rules/workplan-convention.md b/.claude/rules/workplan-convention.md
index e60bb6a..81d6192 100644
--- a/.claude/rules/workplan-convention.md
+++ b/.claude/rules/workplan-convention.md
@@ -46,7 +46,7 @@ fix-consistency. Do not edit or rename it.
 
 **Workplan** is the fleet term — see
 `the-custodian/canon/standards/workplan-terminology-fleet_v0.1.md`.
-**Workstream** is legacy only: some API routes (`/workstreams/`), params
+**Workplan** is legacy only: some API routes (`/workstreams/`), params
 (`workstream_id`), MCP aliases (`create_workstream`), and the frontmatter field
 above remain until `STATE-WP-0069` retires them via legacy-meter. Treat those
 identifiers as workplan IDs. Prefer `GET /workplans/` and `workplan_id` in new
diff --git a/INTENT.md b/INTENT.md
index 4a5c602..68c6105 100644
--- a/INTENT.md
+++ b/INTENT.md
@@ -53,7 +53,7 @@ domain-only routes into those factories.
 3. **How do hubs evolve schema together?** Shared Alembic templates and a
    documented core-schema migration adopters can extend.
 
-It should **not** answer dev-hub questions such as which workstream is blocked,
+It should **not** answer dev-hub questions such as which workplan is blocked,
 which task needs human review, or how kaizen agents spawn maintenance work. Those
 remain in `state-hub` and other host implementations.
 
@@ -85,7 +85,7 @@ models where extended, and workflow callbacks.
 | Concern | Owner |
 |---|---|
 | Running production hub deployment | `state-hub`, `ops-hub`, future hubs |
-| Topics, workstreams, tasks, decisions, SBOM, token accounting | `state-hub` (dev-hub layer) |
+| Topics, workplans, tasks, decisions, SBOM, token accounting | `state-hub` (dev-hub layer) |
 | Custodian canon, constitution, domain charters | `the-custodian` |
 | Event-triggered maintenance task creation | `activity-core` |
 | General issue/task lifecycle outside Custodian workplans | `issue-core` |
diff --git a/README.md b/README.md
index 2df4227..d62d5df 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Reusable FastAPI, SQLAlchemy, and MCP primitives for FOS hubs.
 `hub-core` is being extracted from the standalone State Hub repository as part
 of `CUST-WP-0025`. The initial package slice contains only the generic database
 models and schemas that can move without importing dev-hub concepts such as
-topics, workstreams, tasks, decisions, SBOM, or token accounting.
+topics, workplans, tasks, decisions, SBOM, or token accounting.
 
 Source boundary notes live in:
 
diff --git a/SCOPE.md b/SCOPE.md
index 4bab374..9120ac2 100644
--- a/SCOPE.md
+++ b/SCOPE.md
@@ -39,7 +39,7 @@ deployment, and add domain tables and workflows on top.
 ## Out of scope
 
 - Long-running hub service, Docker image, or production URL for hub-core itself
-- Dev-hub tables: topics, workstreams, tasks, decisions, dependencies, SBOM,
+- Dev-hub tables: topics, workplans, tasks, decisions, dependencies, SBOM,
   token accounting, kaizen agents
 - State Hub dashboard UI, consistency sync scripts, and workplan file authority
 - Custodian canon content and constitution maintenance
@@ -125,7 +125,7 @@ hub-core/
 
 | Repo | Boundary |
 |---|---|
-| `state-hub` | Host dev-hub; imports hub-core factories; keeps workstream/task/decision logic |
+| `state-hub` | Host dev-hub; imports hub-core factories; keeps workplan/task/decision logic |
 | `the-custodian` | Owns extraction boundary doc and CUST-WP-0025 workplan |
 | `reuse-surface` | Federation hub for capability indexes; not a runtime dependency of hub-core |
 | `ops-hub` | Future consumer; operations-specific tables stay local |