diff --git a/packages/angular-persist-query-client/.attw.json b/packages/angular-query-persist-client/.attw.json
similarity index 100%
rename from packages/angular-persist-query-client/.attw.json
rename to packages/angular-query-persist-client/.attw.json
diff --git a/packages/angular-persist-query-client/eslint.config.js b/packages/angular-query-persist-client/eslint.config.js
similarity index 100%
rename from packages/angular-persist-query-client/eslint.config.js
rename to packages/angular-query-persist-client/eslint.config.js
diff --git a/packages/angular-persist-query-client/package.json b/packages/angular-query-persist-client/package.json
similarity index 100%
rename from packages/angular-persist-query-client/package.json
rename to packages/angular-query-persist-client/package.json
diff --git a/packages/angular-persist-query-client/root.eslint.config.js b/packages/angular-query-persist-client/root.eslint.config.js
similarity index 100%
rename from packages/angular-persist-query-client/root.eslint.config.js
rename to packages/angular-query-persist-client/root.eslint.config.js
diff --git a/packages/angular-persist-query-client/root.vite.config.js b/packages/angular-query-persist-client/root.vite.config.js
similarity index 100%
rename from packages/angular-persist-query-client/root.vite.config.js
rename to packages/angular-query-persist-client/root.vite.config.js
diff --git a/packages/angular-persist-query-client/src/__tests__/utils.ts b/packages/angular-query-persist-client/src/__tests__/utils.ts
similarity index 100%
rename from packages/angular-persist-query-client/src/__tests__/utils.ts
rename to packages/angular-query-persist-client/src/__tests__/utils.ts
diff --git a/packages/angular-persist-query-client/src/__tests__/with-persist-query-client.test.ts b/packages/angular-query-persist-client/src/__tests__/with-persist-query-client.test.ts
similarity index 100%
rename from packages/angular-persist-query-client/src/__tests__/with-persist-query-client.test.ts
rename to packages/angular-query-persist-client/src/__tests__/with-persist-query-client.test.ts
diff --git a/packages/angular-persist-query-client/src/index.ts b/packages/angular-query-persist-client/src/index.ts
similarity index 100%
rename from packages/angular-persist-query-client/src/index.ts
rename to packages/angular-query-persist-client/src/index.ts
diff --git a/packages/angular-persist-query-client/src/test-setup.ts b/packages/angular-query-persist-client/src/test-setup.ts
similarity index 100%
rename from packages/angular-persist-query-client/src/test-setup.ts
rename to packages/angular-query-persist-client/src/test-setup.ts
diff --git a/packages/angular-persist-query-client/src/with-persist-query-client.ts b/packages/angular-query-persist-client/src/with-persist-query-client.ts
similarity index 100%
rename from packages/angular-persist-query-client/src/with-persist-query-client.ts
rename to packages/angular-query-persist-client/src/with-persist-query-client.ts
diff --git a/packages/angular-persist-query-client/tsconfig.json b/packages/angular-query-persist-client/tsconfig.json
similarity index 100%
rename from packages/angular-persist-query-client/tsconfig.json
rename to packages/angular-query-persist-client/tsconfig.json
diff --git a/packages/angular-persist-query-client/tsconfig.prod.json b/packages/angular-query-persist-client/tsconfig.prod.json
similarity index 100%
rename from packages/angular-persist-query-client/tsconfig.prod.json
rename to packages/angular-query-persist-client/tsconfig.prod.json
diff --git a/packages/angular-persist-query-client/tsup.config.js b/packages/angular-query-persist-client/tsup.config.js
similarity index 100%
rename from packages/angular-persist-query-client/tsup.config.js
rename to packages/angular-query-persist-client/tsup.config.js
diff --git a/packages/angular-persist-query-client/vite.config.ts b/packages/angular-query-persist-client/vite.config.ts
similarity index 100%
rename from packages/angular-persist-query-client/vite.config.ts
rename to packages/angular-query-persist-client/vite.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c961b7bd5e..9c20836a7a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -254,7 +254,7 @@ importers:
         version: link:../../../packages/angular-query-experimental
       '@tanstack/angular-query-persist-client':
         specifier: ^5.62.7
-        version: link:../../../packages/angular-persist-query-client
+        version: link:../../../packages/angular-query-persist-client
       '@tanstack/query-sync-storage-persister':
         specifier: workspace:*
         version: link:../../../packages/query-sync-storage-persister
@@ -2269,36 +2269,24 @@ importers:
         specifier: ^2.2.8
         version: 2.2.8(typescript@5.8.3)
 
-  packages/angular-persist-query-client:
+  packages/angular-query-devtools-experimental:
     dependencies:
       '@angular/common':
         specifier: '>=16.0.0'
         version: 19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2)
-      '@tanstack/query-persist-client-core':
+      '@tanstack/query-devtools':
         specifier: workspace:*
-        version: link:../query-persist-client-core
+        version: link:../query-devtools
     devDependencies:
-      '@angular/compiler':
-        specifier: ^19.2.4
-        version: 19.2.4
       '@angular/core':
         specifier: ^19.2.4
         version: 19.2.4(rxjs@7.8.2)(zone.js@0.15.0)
-      '@angular/platform-browser':
-        specifier: ^19.2.4
-        version: 19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))
       '@angular/platform-browser-dynamic':
         specifier: ^19.2.4
         version: 19.2.4(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/compiler@19.2.4)(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))
       '@tanstack/angular-query-experimental':
         specifier: workspace:*
         version: link:../angular-query-experimental
-      '@testing-library/angular':
-        specifier: ^17.3.2
-        version: 17.3.7(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/router@19.2.4(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(rxjs@7.8.2))(@testing-library/dom@10.4.0)
-      '@testing-library/dom':
-        specifier: ^10.4.0
-        version: 10.4.0
       eslint-plugin-jsdoc:
         specifier: ^50.5.0
         version: 50.5.0(eslint@9.15.0(jiti@2.4.2))
@@ -2306,24 +2294,30 @@ importers:
         specifier: ^5.0.0
         version: 5.0.2
 
-  packages/angular-query-devtools-experimental:
+  packages/angular-query-experimental:
     dependencies:
       '@angular/common':
         specifier: '>=16.0.0'
         version: 19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2)
+      '@tanstack/query-core':
+        specifier: workspace:*
+        version: link:../query-core
       '@tanstack/query-devtools':
         specifier: workspace:*
         version: link:../query-devtools
     devDependencies:
+      '@angular/compiler':
+        specifier: ^19.2.4
+        version: 19.2.4
       '@angular/core':
         specifier: ^19.2.4
         version: 19.2.4(rxjs@7.8.2)(zone.js@0.15.0)
+      '@angular/platform-browser':
+        specifier: ^19.2.4
+        version: 19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))
       '@angular/platform-browser-dynamic':
         specifier: ^19.2.4
         version: 19.2.4(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/compiler@19.2.4)(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))
-      '@tanstack/angular-query-experimental':
-        specifier: workspace:*
-        version: link:../angular-query-experimental
       eslint-plugin-jsdoc:
         specifier: ^50.5.0
         version: 50.5.0(eslint@9.15.0(jiti@2.4.2))
@@ -2331,17 +2325,14 @@ importers:
         specifier: ^5.0.0
         version: 5.0.2
 
-  packages/angular-query-experimental:
+  packages/angular-query-persist-client:
     dependencies:
       '@angular/common':
         specifier: '>=16.0.0'
         version: 19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2)
-      '@tanstack/query-core':
-        specifier: workspace:*
-        version: link:../query-core
-      '@tanstack/query-devtools':
+      '@tanstack/query-persist-client-core':
         specifier: workspace:*
-        version: link:../query-devtools
+        version: link:../query-persist-client-core
     devDependencies:
       '@angular/compiler':
         specifier: ^19.2.4
@@ -2355,6 +2346,15 @@ importers:
       '@angular/platform-browser-dynamic':
         specifier: ^19.2.4
         version: 19.2.4(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/compiler@19.2.4)(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))
+      '@tanstack/angular-query-experimental':
+        specifier: workspace:*
+        version: link:../angular-query-experimental
+      '@testing-library/angular':
+        specifier: ^17.3.2
+        version: 17.3.7(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/router@19.2.4(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(@angular/platform-browser@19.2.4(@angular/animations@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(@angular/common@19.2.4(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0))(rxjs@7.8.2))(@angular/core@19.2.4(rxjs@7.8.2)(zone.js@0.15.0)))(rxjs@7.8.2))(@testing-library/dom@10.4.0)
+      '@testing-library/dom':
+        specifier: ^10.4.0
+        version: 10.4.0
       eslint-plugin-jsdoc:
         specifier: ^50.5.0
         version: 50.5.0(eslint@9.15.0(jiti@2.4.2))