diff --git a/apps/connect/CHANGELOG.md b/apps/connect/CHANGELOG.md
index 01456110..beb0a2cd 100644
--- a/apps/connect/CHANGELOG.md
+++ b/apps/connect/CHANGELOG.md
@@ -1,5 +1,12 @@
 # connect
 
+## 0.2.1
+### Patch Changes
+
+- Updated dependencies [e324e68]
+  - @graphprotocol/hypergraph@0.4.1
+  - @graphprotocol/hypergraph-react@0.4.1
+
 ## 0.2.0
 ### Minor Changes
 
diff --git a/apps/connect/package.json b/apps/connect/package.json
index ea39cf34..41bc0f53 100644
--- a/apps/connect/package.json
+++ b/apps/connect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "connect",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite --force",
diff --git a/apps/create-hypergraph/CHANGELOG.md b/apps/create-hypergraph/CHANGELOG.md
index 3ebff906..ec665e26 100644
--- a/apps/create-hypergraph/CHANGELOG.md
+++ b/apps/create-hypergraph/CHANGELOG.md
@@ -1,5 +1,10 @@
 # create-hypergraph
 
+## 0.4.2
+### Patch Changes
+
+- Update templates to use the Id from @graphprotocol/hypergraph package
+
 ## 0.4.1
 ### Patch Changes
 
diff --git a/apps/create-hypergraph/package.json b/apps/create-hypergraph/package.json
index 9dad9320..41516d5f 100644
--- a/apps/create-hypergraph/package.json
+++ b/apps/create-hypergraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-hypergraph",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "CLI toolchain to scaffold a Hypergraph-enabled application with a given template.",
   "type": "module",
   "bin": {
diff --git a/apps/create-hypergraph/template-nextjs/app/mapping.ts b/apps/create-hypergraph/template-nextjs/app/mapping.ts
index cf9eee71..6c0cf6a2 100644
--- a/apps/create-hypergraph/template-nextjs/app/mapping.ts
+++ b/apps/create-hypergraph/template-nextjs/app/mapping.ts
@@ -1,5 +1,5 @@
-import { Id } from '@graphprotocol/grc-20';
 import type { Mapping } from '@graphprotocol/hypergraph';
+import { Id } from '@graphprotocol/hypergraph';
 
 export const mapping: Mapping.Mapping = {
   Address: {
diff --git a/apps/create-hypergraph/template-nextjs/package.json b/apps/create-hypergraph/template-nextjs/package.json
index f50cd159..bd9044be 100644
--- a/apps/create-hypergraph/template-nextjs/package.json
+++ b/apps/create-hypergraph/template-nextjs/package.json
@@ -15,7 +15,6 @@
   },
   "type": "module",
   "dependencies": {
-    "@graphprotocol/grc-20": "^0.24.1",
     "@graphprotocol/hypergraph": "workspace:*",
     "@graphprotocol/hypergraph-react": "workspace:*",
     "@radix-ui/react-navigation-menu": "^1.2.13",
diff --git a/apps/create-hypergraph/template-vite-react/package.json b/apps/create-hypergraph/template-vite-react/package.json
index 36e7c2a6..86799577 100644
--- a/apps/create-hypergraph/template-vite-react/package.json
+++ b/apps/create-hypergraph/template-vite-react/package.json
@@ -11,7 +11,6 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@graphprotocol/grc-20": "^0.24.1",
     "@graphprotocol/hypergraph": "workspace:*",
     "@graphprotocol/hypergraph-react": "workspace:*",
     "@radix-ui/react-navigation-menu": "^1.2.13",
diff --git a/apps/create-hypergraph/template-vite-react/src/mapping.ts b/apps/create-hypergraph/template-vite-react/src/mapping.ts
index 5d78a0f3..b6431a44 100644
--- a/apps/create-hypergraph/template-vite-react/src/mapping.ts
+++ b/apps/create-hypergraph/template-vite-react/src/mapping.ts
@@ -1,5 +1,5 @@
-import { Id } from '@graphprotocol/grc-20';
 import type { Mapping } from '@graphprotocol/hypergraph';
+import { Id } from '@graphprotocol/hypergraph';
 
 export const mapping: Mapping.Mapping = {
   Address: {
diff --git a/apps/events/src/mapping.ts b/apps/events/src/mapping.ts
index d3536877..7db1532c 100644
--- a/apps/events/src/mapping.ts
+++ b/apps/events/src/mapping.ts
@@ -1,5 +1,5 @@
-import { Id } from '@graphprotocol/grc-20';
 import type { Mapping } from '@graphprotocol/hypergraph';
+import { Id } from '@graphprotocol/hypergraph';
 
 export const mapping: Mapping.Mapping = {
   Event: {
diff --git a/apps/server/CHANGELOG.md b/apps/server/CHANGELOG.md
index f16e029a..7ad8effa 100644
--- a/apps/server/CHANGELOG.md
+++ b/apps/server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # server
 
+## 0.1.5
+### Patch Changes
+
+- Updated dependencies [e324e68]
+  - @graphprotocol/hypergraph@0.4.1
+
 ## 0.1.4
 ### Patch Changes
 
diff --git a/apps/server/package.json b/apps/server/package.json
index 85c478b7..8911b65f 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/docs/docs/typesync.md b/docs/docs/typesync.md
index bf620676..d25572cc 100644
--- a/docs/docs/typesync.md
+++ b/docs/docs/typesync.md
@@ -58,8 +58,8 @@ You're all set! You can now start building your application by editing the files
 
 Example of the generated schema (```src/schema.ts```):
 ```typescript
-import { Id } from '@graphprotocol/grc-20';
-import type { Mapping } from '@graphprotocol/typesync/Mapping';
+import type { Mapping } from '@graphprotocol/hypergraph';
+import { Id } from '@graphprotocol/hypergraph';
 
 export const mapping: Mapping = {
   AcademicYear: {
diff --git a/packages/hypergraph-react/CHANGELOG.md b/packages/hypergraph-react/CHANGELOG.md
index 16e90811..81754439 100644
--- a/packages/hypergraph-react/CHANGELOG.md
+++ b/packages/hypergraph-react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @graphprotocol/hypergraph-react
 
+## 0.4.1
+### Patch Changes
+
+- Updated dependencies [e324e68]
+  - @graphprotocol/hypergraph@0.4.1
+
 ## 0.4.0
 ### Minor Changes
 
diff --git a/packages/hypergraph-react/package.json b/packages/hypergraph-react/package.json
index 9ebdf889..b74d7072 100644
--- a/packages/hypergraph-react/package.json
+++ b/packages/hypergraph-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/hypergraph-react",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "React implementation and additional functionality, components, and hooks for the hypergraph SDK framework",
   "keywords": [
     "Web3",
diff --git a/packages/hypergraph/CHANGELOG.md b/packages/hypergraph/CHANGELOG.md
index 6aaf6f59..6a524b51 100644
--- a/packages/hypergraph/CHANGELOG.md
+++ b/packages/hypergraph/CHANGELOG.md
@@ -1,5 +1,10 @@
 # @graphprotocol/hypergraph
 
+## 0.4.1
+### Patch Changes
+
+- e324e68: use Id from @graphprotocol/hypergraph
+
 ## 0.4.0
 ### Minor Changes
 
diff --git a/packages/hypergraph/package.json b/packages/hypergraph/package.json
index 97f2b7db..f99b9331 100644
--- a/packages/hypergraph/package.json
+++ b/packages/hypergraph/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/hypergraph",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "SDK for building performant, type-safe, local-first dapps on top of The Graph ecosystem knowledge graphs.",
   "publishConfig": {
     "bin": {
diff --git a/packages/hypergraph/src/mapping/Mapping.ts b/packages/hypergraph/src/mapping/Mapping.ts
index b775a9bd..451c4679 100644
--- a/packages/hypergraph/src/mapping/Mapping.ts
+++ b/packages/hypergraph/src/mapping/Mapping.ts
@@ -41,7 +41,7 @@ export type MappingEntry = {
 /**
  * @example
  * ```ts
- * import { Id } from '@graphprotocol/grc-20'
+ * import { Id } from '@graphprotocol/hypergraph'
  * import type { Mapping } from '@graphprotocol/hypergraph/mapping'
  *
  * const mapping: Mapping = {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 93aba193..c77978b6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -174,9 +174,6 @@ importers:
 
   apps/create-hypergraph/template-nextjs:
     dependencies:
-      '@graphprotocol/grc-20':
-        specifier: ^0.24.1
-        version: 0.24.1(bufferutil@4.0.9)(ox@0.6.9(typescript@5.8.3)(zod@3.25.51))(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
       '@graphprotocol/hypergraph':
         specifier: workspace:*
         version: link:../../../packages/hypergraph/publish
@@ -253,9 +250,6 @@ importers:
 
   apps/create-hypergraph/template-vite-react:
     dependencies:
-      '@graphprotocol/grc-20':
-        specifier: ^0.24.1
-        version: 0.24.1(bufferutil@4.0.9)(ox@0.6.9(typescript@5.8.3)(zod@3.25.51))(typescript@5.8.3)(utf-8-validate@5.0.10)(zod@3.25.51)
       '@graphprotocol/hypergraph':
         specifier: workspace:*
         version: link:../../../packages/hypergraph/publish
@@ -20824,8 +20818,8 @@ snapshots:
       '@typescript-eslint/parser': 8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3)
       eslint: 9.31.0(jiti@2.5.1)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.31.0(jiti@2.5.1))
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.31.0(jiti@2.5.1))
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1))
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1))
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.31.0(jiti@2.5.1))
       eslint-plugin-react: 7.37.5(eslint@9.31.0(jiti@2.5.1))
       eslint-plugin-react-hooks: 5.2.0(eslint@9.31.0(jiti@2.5.1))
@@ -20844,7 +20838,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0)(eslint@9.31.0(jiti@2.5.1)):
+  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)):
     dependencies:
       '@nolyfill/is-core-module': 1.0.39
       debug: 4.4.1
@@ -20855,22 +20849,22 @@ snapshots:
       tinyglobby: 0.2.14
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.31.0(jiti@2.5.1))
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1))
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.31.0(jiti@2.5.1)):
+  eslint-module-utils@2.12.1(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3)
       eslint: 9.31.0(jiti@2.5.1)
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.31.0(jiti@2.5.1))
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1))
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.31.0(jiti@2.5.1)):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -20881,7 +20875,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 9.31.0(jiti@2.5.1)
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1)(eslint@9.31.0(jiti@2.5.1))
+      eslint-module-utils: 2.12.1(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.38.0(eslint@9.31.0(jiti@2.5.1))(typescript@5.8.3))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1)))(eslint@9.31.0(jiti@2.5.1))
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3