diff --git a/CLAUDE.md b/CLAUDE.md
index 762f4d5..a639d87 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -112,7 +112,7 @@ Three skill sources are available to agents launched at the parent root. Every n
 | `rust-sdk-patterns` | writing or reviewing Miden contract code (`#[component]`, `#[note]`, `#[tx_script]`), storage, native functions, asset handling, P2ID output notes, cross-component calls. |
 | `rust-sdk-pitfalls` | debugging contract code or asking about felt arithmetic, comparison ops, 4-Word arg limits, storage naming, no-std, P2ID roots, NoteType ctors, note-to-component boundaries, note input immutability. |
 | `rust-sdk-testing-patterns` | writing MockChain integration tests: account / note creation, storage verification, multi-tx tests, output-note assertions, asset-bearing notes. |
-| `rust-sdk-source-guide` | advanced multi-contract patterns or exploring `miden-base`, `compiler`, `miden-client`, `tutorials` source repos. Documents Plan Mode and verification-driven dev for contract work. |
+| `rust-sdk-source-guide` | advanced multi-contract patterns or exploring `protocol`, `compiler`, `rust-sdk`, `tutorials` source repos. Documents Plan Mode and verification-driven dev for contract work. |
 | `local-node-validation` | MockChain tests pass and the contract needs to be validated against a real local Miden node before the frontend phase. |
 | `miden-client-cli` | installing or using the `miden client` CLI via midenup or direct `cargo install`; canonical command and config reference. Project-template only. |
 
@@ -127,7 +127,7 @@ Three skill sources are available to agents launched at the parent root. Every n
 | `vite-wasm-setup` | configuring Vite for Miden: `midenVitePlugin()`, COOP/COEP headers, dev and production deployment headers, TypeScript compatibility. |
 | `frontend-pitfalls` | debugging a frontend bug: WASM init race, recursive WASM access, COOP/COEP misconfig, BigInt mismatch, Bech32 network mismatch, IndexedDB state loss, auto-sync side effects, StrictMode double-init. |
 | `testing-patterns` | writing Vitest + testing-library tests for Miden React components (`@miden-sdk/react` mock factory, fixtures, transaction-stage simulation). |
-| `frontend-source-guide` | advanced frontend patterns or exploring `miden-client` source for custom hooks, custom signers, raw `WasmWebClient` usage. |
+| `frontend-source-guide` | advanced frontend patterns or exploring `web-sdk` source for custom hooks, custom signers, raw `WasmWebClient` usage. |
 
 ### `0xMiden/agent-tools` (22 skills upstream, fallback)
 
@@ -195,4 +195,4 @@ Per-mode guidance for non-implementation work. These workflows do not exempt bui
 - **Architecture research.** Compose multiple skills across both submodules (for a wallet-integrated dapp, that is `miden-concepts` + `rust-sdk-patterns` + `react-sdk-patterns` + `signer-integration`). Reach for `agent-tools` when the topic is not covered, especially MASM-level topics.
 - **Application planning.** Reference the `examples/miden-bank` app inside `0xMiden/tutorials` and the broader tutorials examples as canonical projects builders can study or extend.
 - **Debugging existing Miden code.** Load the relevant `*-pitfalls` skill plus the matching `*-patterns` skill (`frontend-pitfalls` + `react-sdk-patterns`; `rust-sdk-pitfalls` + `rust-sdk-patterns`). For MASM-level debugging, fall back to the `agent-tools` MASM family.
-- **Factuality is required.** Any answer in Q&A or research mode must be correct and grounded in source. If a question exceeds what the loaded skills cover, the agent must verify against the actual source repositories using `rust-sdk-source-guide` (for contract or Rust topics) or `frontend-source-guide` (for frontend or web SDK topics) -- those skills map the relevant repos (`miden-base`, `compiler`, `miden-client`, `tutorials`). Speculation, "probably", or "should be" answers are not acceptable. Verify in source, or say "not covered, would need to check X".
+- **Factuality is required.** Any answer in Q&A or research mode must be correct and grounded in source. If a question exceeds what the loaded skills cover, the agent must verify against the actual source repositories using `rust-sdk-source-guide` (for contract or Rust topics) or `frontend-source-guide` (for frontend or web SDK topics) -- those skills map the relevant repos (`protocol`, `compiler`, `rust-sdk`, `web-sdk`, `tutorials`). Speculation, "probably", or "should be" answers are not acceptable. Verify in source, or say "not covered, would need to check X".
diff --git a/README.md b/README.md
index 56a8fe9..e44f9ca 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ No build pipeline required. Open Claude Code (or Codex) at the repository root a
 - **Writing or reviewing a frontend** → `react-sdk-patterns`, `frontend-pitfalls`, `web-client-usage`, `signer-integration`, `vite-wasm-setup`
 - **MASM authoring or debugging** → the MASM family in `0xMiden/agent-tools` (`masm-formatting`, `masm-doc-comments`, `masm-padding`, …)
 - **Architecture / planning** — compose multiple skills; reference the `examples/miden-bank` app in `0xMiden/tutorials`
-- **Going deeper than the skills cover** → `rust-sdk-source-guide` or `frontend-source-guide` to verify against the actual `miden-base`, `miden-client`, `compiler`, and `tutorials` source
+- **Going deeper than the skills cover** → `rust-sdk-source-guide` or `frontend-source-guide` to verify against the actual `protocol`, `rust-sdk`, `web-sdk`, `compiler`, and `tutorials` source
 
 Hard rule, encoded in `CLAUDE.md`: any answer must be grounded in skill content or verified in source. "Probably" and "should be" are not acceptable.
 
diff --git a/frontend-template b/frontend-template
index 8a9fcf0..c5c3ad1 160000
--- a/frontend-template
+++ b/frontend-template
@@ -1 +1 @@
-Subproject commit 8a9fcf0cec585990790531ae43f9694e294bee2d
+Subproject commit c5c3ad1e71b8213cc24397fcbe8eeed93ea00c17
diff --git a/project-template b/project-template
index 5270c0a..80394cd 160000
--- a/project-template
+++ b/project-template
@@ -1 +1 @@
-Subproject commit 5270c0afa088e75ce002548bf847f0b7859b4924
+Subproject commit 80394cdc3a9ade9ad445572a410a5c4b838b6b8a