diff --git a/.gitignore b/.gitignore
index 6e0fb1b..eab27b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,5 @@ packages/dom/dist/**
 !packages/dom/dist/index.cjs
 !packages/dom/dist/index.js
 packages/context-state/dist/**
-packages/context-state2/dist/**
 !packages/context-state/dist/index.cjs
 !packages/context-state/dist/index.js
diff --git a/package-lock.json b/package-lock.json
index 382f278..5ffc949 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2352,10 +2352,6 @@
       "resolved": "packages/context-state",
       "link": true
     },
-    "node_modules/@react-rxjs/context-state2": {
-      "resolved": "packages/context-state2",
-      "link": true
-    },
     "node_modules/@react-rxjs/core": {
       "resolved": "packages/core",
       "link": true
@@ -8668,20 +8664,6 @@
         "rxjs": ">=7"
       }
     },
-    "packages/context-state2": {
-      "version": "0.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "use-sync-external-store": "^1.0.0"
-      },
-      "devDependencies": {
-        "@types/use-sync-external-store": "^0.0.3"
-      },
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "rxjs": ">=7"
-      }
-    },
     "packages/core": {
       "name": "@react-rxjs/core",
       "version": "0.10.3",
@@ -10385,13 +10367,6 @@
         "use-sync-external-store": "^1.0.0"
       }
     },
-    "@react-rxjs/context-state2": {
-      "version": "file:packages/context-state2",
-      "requires": {
-        "@types/use-sync-external-store": "^0.0.3",
-        "use-sync-external-store": "^1.0.0"
-      }
-    },
     "@react-rxjs/core": {
       "version": "file:packages/core",
       "requires": {
diff --git a/packages/context-state2/README.md b/packages/context-state/README.md
similarity index 100%
rename from packages/context-state2/README.md
rename to packages/context-state/README.md
diff --git a/packages/context-state2/babel.config.js b/packages/context-state/babel.config.js
similarity index 100%
rename from packages/context-state2/babel.config.js
rename to packages/context-state/babel.config.js
diff --git a/packages/context-state2/jest.config.js b/packages/context-state/jest.config.js
similarity index 100%
rename from packages/context-state2/jest.config.js
rename to packages/context-state/jest.config.js
diff --git a/packages/context-state2/package.json b/packages/context-state/package.json
similarity index 97%
rename from packages/context-state2/package.json
rename to packages/context-state/package.json
index b55449f..d6ae176 100644
--- a/packages/context-state2/package.json
+++ b/packages/context-state/package.json
@@ -44,7 +44,7 @@
     "semi": false,
     "trailingComma": "all"
   },
-  "name": "@react-rxjs/context-state2",
+  "name": "@react-rxjs/context-state",
   "authors": [
     "Josep M Sobrepere (https://github.com/josepot)",
     "Victor Oliva (https://github.com/voliva)"
diff --git a/packages/context-state2/setupTests.ts b/packages/context-state/setupTests.ts
similarity index 100%
rename from packages/context-state2/setupTests.ts
rename to packages/context-state/setupTests.ts
diff --git a/packages/context-state2/src/combineStates.test.ts b/packages/context-state/src/combineStates.test.ts
similarity index 100%
rename from packages/context-state2/src/combineStates.test.ts
rename to packages/context-state/src/combineStates.test.ts
diff --git a/packages/context-state2/src/combineStates.ts b/packages/context-state/src/combineStates.ts
similarity index 100%
rename from packages/context-state2/src/combineStates.ts
rename to packages/context-state/src/combineStates.ts
diff --git a/packages/context-state2/src/create-root.ts b/packages/context-state/src/create-root.ts
similarity index 100%
rename from packages/context-state2/src/create-root.ts
rename to packages/context-state/src/create-root.ts
diff --git a/packages/context-state2/src/create-signal.test.ts b/packages/context-state/src/create-signal.test.ts
similarity index 100%
rename from packages/context-state2/src/create-signal.test.ts
rename to packages/context-state/src/create-signal.test.ts
diff --git a/packages/context-state2/src/create-signal.ts b/packages/context-state/src/create-signal.ts
similarity index 100%
rename from packages/context-state2/src/create-signal.ts
rename to packages/context-state/src/create-signal.ts
diff --git a/packages/context-state2/src/index.tsx b/packages/context-state/src/index.tsx
similarity index 100%
rename from packages/context-state2/src/index.tsx
rename to packages/context-state/src/index.tsx
diff --git a/packages/context-state2/src/internal/empty-value.ts b/packages/context-state/src/internal/empty-value.ts
similarity index 100%
rename from packages/context-state2/src/internal/empty-value.ts
rename to packages/context-state/src/internal/empty-value.ts
diff --git a/packages/context-state2/src/internal/errors.ts b/packages/context-state/src/internal/errors.ts
similarity index 100%
rename from packages/context-state2/src/internal/errors.ts
rename to packages/context-state/src/internal/errors.ts
diff --git a/packages/context-state2/src/internal/index.ts b/packages/context-state/src/internal/index.ts
similarity index 100%
rename from packages/context-state2/src/internal/index.ts
rename to packages/context-state/src/internal/index.ts
diff --git a/packages/context-state2/src/internal/internals.ts b/packages/context-state/src/internal/internals.ts
similarity index 100%
rename from packages/context-state2/src/internal/internals.ts
rename to packages/context-state/src/internal/internals.ts
diff --git a/packages/context-state2/src/internal/nested-map.ts b/packages/context-state/src/internal/nested-map.ts
similarity index 100%
rename from packages/context-state2/src/internal/nested-map.ts
rename to packages/context-state/src/internal/nested-map.ts
diff --git a/packages/context-state2/src/internal/parent-changes.ts b/packages/context-state/src/internal/parent-changes.ts
similarity index 100%
rename from packages/context-state2/src/internal/parent-changes.ts
rename to packages/context-state/src/internal/parent-changes.ts
diff --git a/packages/context-state2/src/internal/promises.ts b/packages/context-state/src/internal/promises.ts
similarity index 100%
rename from packages/context-state2/src/internal/promises.ts
rename to packages/context-state/src/internal/promises.ts
diff --git a/packages/context-state2/src/internal/record-utils.ts b/packages/context-state/src/internal/record-utils.ts
similarity index 100%
rename from packages/context-state2/src/internal/record-utils.ts
rename to packages/context-state/src/internal/record-utils.ts
diff --git a/packages/context-state2/src/internal/state-instance.ts b/packages/context-state/src/internal/state-instance.ts
similarity index 100%
rename from packages/context-state2/src/internal/state-instance.ts
rename to packages/context-state/src/internal/state-instance.ts
diff --git a/packages/context-state2/src/internal/state-node.ts b/packages/context-state/src/internal/state-node.ts
similarity index 100%
rename from packages/context-state2/src/internal/state-node.ts
rename to packages/context-state/src/internal/state-node.ts
diff --git a/packages/context-state2/src/objectBased.ts b/packages/context-state/src/objectBased.ts
similarity index 100%
rename from packages/context-state2/src/objectBased.ts
rename to packages/context-state/src/objectBased.ts
diff --git a/packages/context-state2/src/route-state.test.ts b/packages/context-state/src/route-state.test.ts
similarity index 100%
rename from packages/context-state2/src/route-state.test.ts
rename to packages/context-state/src/route-state.test.ts
diff --git a/packages/context-state2/src/route-state.ts b/packages/context-state/src/route-state.ts
similarity index 100%
rename from packages/context-state2/src/route-state.ts
rename to packages/context-state/src/route-state.ts
diff --git a/packages/context-state2/src/subinstance.test.ts b/packages/context-state/src/subinstance.test.ts
similarity index 100%
rename from packages/context-state2/src/subinstance.test.ts
rename to packages/context-state/src/subinstance.test.ts
diff --git a/packages/context-state2/src/subinstance.ts b/packages/context-state/src/subinstance.ts
similarity index 100%
rename from packages/context-state2/src/subinstance.ts
rename to packages/context-state/src/subinstance.ts
diff --git a/packages/context-state2/src/substate.test.ts b/packages/context-state/src/substate.test.ts
similarity index 100%
rename from packages/context-state2/src/substate.test.ts
rename to packages/context-state/src/substate.test.ts
diff --git a/packages/context-state2/src/substate.ts b/packages/context-state/src/substate.ts
similarity index 100%
rename from packages/context-state2/src/substate.ts
rename to packages/context-state/src/substate.ts
diff --git a/packages/context-state2/src/test-utils/finalizationRegistry.ts b/packages/context-state/src/test-utils/finalizationRegistry.ts
similarity index 100%
rename from packages/context-state2/src/test-utils/finalizationRegistry.ts
rename to packages/context-state/src/test-utils/finalizationRegistry.ts
diff --git a/packages/context-state2/src/test-utils/instance-node.ts b/packages/context-state/src/test-utils/instance-node.ts
similarity index 100%
rename from packages/context-state2/src/test-utils/instance-node.ts
rename to packages/context-state/src/test-utils/instance-node.ts
diff --git a/packages/context-state2/src/types.ts b/packages/context-state/src/types.ts
similarity index 100%
rename from packages/context-state2/src/types.ts
rename to packages/context-state/src/types.ts
diff --git a/packages/context-state2/tsconfig-build.json b/packages/context-state/tsconfig-build.json
similarity index 100%
rename from packages/context-state2/tsconfig-build.json
rename to packages/context-state/tsconfig-build.json
diff --git a/packages/context-state2/tsconfig.json b/packages/context-state/tsconfig.json
similarity index 100%
rename from packages/context-state2/tsconfig.json
rename to packages/context-state/tsconfig.json