diff --git a/package-lock.json b/package-lock.json
index 969972d96b..80c90fcbf3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4718,14 +4718,14 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "packages/ts/core",
-      "link": true
-    },
     "node_modules/@vaadin/hilla-file-router": {
       "resolved": "packages/ts/hilla-file-router",
       "link": true
     },
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "packages/ts/frontend",
+      "link": true
+    },
     "node_modules/@vaadin/hilla-generator-cli": {
       "resolved": "packages/ts/generator-cli",
       "link": true
@@ -16030,6 +16030,37 @@
     "packages/ts/core": {
       "name": "@vaadin/hilla-core",
       "version": "24.4.0-alpha2",
+      "extraneous": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@vaadin/common-frontend": "^0.0.19",
+        "atmosphere.js": "^3.1.3",
+        "js-cookie": "^3.0.5"
+      },
+      "devDependencies": {
+        "@esm-bundle/chai": "^4.3.4-fix.0",
+        "@open-wc/testing": "^3.2.0",
+        "@types/atmosphere.js": "^2.1.4",
+        "@types/chai": "^4.3.6",
+        "@types/chai-as-promised": "^7.1.6",
+        "@types/js-cookie": "^3.0.4",
+        "@types/mocha": "^10.0.2",
+        "@types/sinon": "^10.0.17",
+        "@types/sinon-chai": "^3.2.10",
+        "@types/validator": "^13.11.2",
+        "chai-as-promised": "^7.1.1",
+        "chai-dom": "^1.11.0",
+        "fetch-mock": "^9.11.0",
+        "sinon": "^16.0.0",
+        "sinon-chai": "^3.7.0",
+        "typescript": "5.3.2"
+      },
+      "peerDependencies": {
+        "lit": "^3.0.0"
+      }
+    },
+    "packages/ts/frontend": {
+      "version": "24.4.0-alpha3",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -16060,10 +16091,10 @@
     },
     "packages/ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -16077,7 +16108,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -16094,7 +16125,7 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-cli/node_modules/rimraf": {
@@ -16116,11 +16147,11 @@
     },
     "packages/ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.3.2"
@@ -16164,10 +16195,10 @@
     },
     "packages/ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.3.2"
@@ -16178,8 +16209,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16195,8 +16226,8 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-backbone/node_modules/rimraf": {
@@ -16218,10 +16249,10 @@
     },
     "packages/ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "typescript": "5.3.2"
       },
       "devDependencies": {
@@ -16230,8 +16261,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16247,8 +16278,8 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-barrel/node_modules/rimraf": {
@@ -16270,10 +16301,10 @@
     },
     "packages/ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "typescript": "5.3.2"
       },
       "devDependencies": {
@@ -16282,7 +16313,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16298,7 +16329,7 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-client/node_modules/rimraf": {
@@ -16320,10 +16351,10 @@
     },
     "packages/ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.3.2"
@@ -16334,8 +16365,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16351,9 +16382,9 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
-        "@vaadin/hilla-lit-form": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha3",
+        "@vaadin/hilla-lit-form": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-model/node_modules/rimraf": {
@@ -16375,10 +16406,10 @@
     },
     "packages/ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.3.2"
@@ -16389,8 +16420,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16406,8 +16437,8 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-push/node_modules/rimraf": {
@@ -16429,10 +16460,10 @@
     },
     "packages/ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-utils": "24.4.0-alpha3",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.3.2"
@@ -16443,9 +16474,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-model": "24.4.0-alpha2",
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-model": "24.4.0-alpha3",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -16461,9 +16492,9 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@vaadin/hilla-generator-core": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha2",
-        "@vaadin/hilla-generator-plugin-model": "24.4.0-alpha2"
+        "@vaadin/hilla-generator-core": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-client": "24.4.0-alpha3",
+        "@vaadin/hilla-generator-plugin-model": "24.4.0-alpha3"
       }
     },
     "packages/ts/generator-plugin-subtypes/node_modules/rimraf": {
@@ -16485,7 +16516,7 @@
     },
     "packages/ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -16531,7 +16562,7 @@
     },
     "packages/ts/hilla-file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.4.0-alpha1",
+      "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/hilla-generator-utils": "^24.4.0-alpha1",
@@ -16627,10 +16658,10 @@
     },
     "packages/ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -16652,10 +16683,10 @@
     },
     "packages/ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -16681,12 +16712,12 @@
     },
     "packages/ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
-        "@vaadin/hilla-lit-form": "24.4.0-alpha2",
-        "@vaadin/hilla-react-form": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
+        "@vaadin/hilla-lit-form": "24.4.0-alpha3",
+        "@vaadin/hilla-react-form": "24.4.0-alpha3",
         "@vaadin/react-components": "24.4.0-alpha10"
       },
       "devDependencies": {
@@ -16714,10 +16745,10 @@
     },
     "packages/ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.4.0-alpha2",
+      "version": "24.4.0-alpha3",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.4.0-alpha2"
+        "@vaadin/hilla-lit-form": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointController.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointController.java
index 8ea2a10c1d..e5c9639872 100644
--- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointController.java
+++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/EndpointController.java
@@ -76,7 +76,7 @@
  */
 @RestController
 @Import({ EndpointControllerConfiguration.class, EndpointProperties.class })
-@NpmPackage(value = "@vaadin/hilla-core", version = "24.4.0-alpha3")
+@NpmPackage(value = "@vaadin/hilla-frontend", version = "24.4.0-alpha3")
 public class EndpointController {
     private static final Logger LOGGER = LoggerFactory
             .getLogger(EndpointController.class);
diff --git a/packages/java/endpoint/src/main/resources/connect-client.default.template.ts b/packages/java/endpoint/src/main/resources/connect-client.default.template.ts
index 43380fba64..6a111debd0 100644
--- a/packages/java/endpoint/src/main/resources/connect-client.default.template.ts
+++ b/packages/java/endpoint/src/main/resources/connect-client.default.template.ts
@@ -1,3 +1,3 @@
-import {ConnectClient} from '@vaadin/hilla-core';
+import {ConnectClient} from '@vaadin/hilla-frontend';
 const client = new ConnectClient({prefix: '{{PREFIX}}'});
 export default client;
diff --git a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskGenerateEndpointTest.java b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskGenerateEndpointTest.java
index 3932d36716..d0cd4e47e4 100644
--- a/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskGenerateEndpointTest.java
+++ b/packages/java/engine-runtime/src/test/java/com/vaadin/hilla/internal/TaskGenerateEndpointTest.java
@@ -58,7 +58,7 @@ public void should_generate_Two_TypeScriptFiles() throws Exception {
 
         String output = FileUtils.readFileToString(client, "UTF-8");
         assertThat(output, containsString(
-                "import { ConnectClient as ConnectClient_1 } from \"@vaadin/hilla-core\";"));
+                "import { ConnectClient as ConnectClient_1 } from \"@vaadin/hilla-frontend\";"));
         assertThat(output, containsString(
                 "const client_1 = new ConnectClient_1({ prefix: \"connect\" });"));
         assertThat(output, containsString("export default client_1;"));
diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
index 9ebbf4f731..1d4590cc2d 100644
--- a/packages/java/tests/csrf-context/package-lock.json
+++ b/packages/java/tests/csrf-context/package-lock.json
@@ -9,7 +9,7 @@
       "dependencies": {
         "@polymer/polymer": "3.5.1",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "../../../ts/core",
+        "@vaadin/hilla-frontend": "../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "../../../ts/generator-plugin-backbone",
@@ -66,8 +66,8 @@
     "../../../../ts/generator-utils": {
       "extraneous": true
     },
-    "../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -421,7 +421,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "*",
+        "@vaadin/hilla-frontend": "*",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -3398,8 +3398,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9301,8 +9301,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
diff --git a/packages/java/tests/csrf-context/package.json b/packages/java/tests/csrf-context/package.json
index 3bd5019c90..479f4af79d 100644
--- a/packages/java/tests/csrf-context/package.json
+++ b/packages/java/tests/csrf-context/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "../../../ts/core",
+    "@vaadin/hilla-frontend": "../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "../../../ts/generator-plugin-backbone",
@@ -41,7 +41,7 @@
     "dependencies": {
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -80,7 +80,7 @@
     "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/csrf/package-lock.json b/packages/java/tests/csrf/package-lock.json
index c33596f2a8..5c11bf81d0 100644
--- a/packages/java/tests/csrf/package-lock.json
+++ b/packages/java/tests/csrf/package-lock.json
@@ -9,7 +9,7 @@
       "dependencies": {
         "@polymer/polymer": "3.5.1",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "../../../ts/core",
+        "@vaadin/hilla-frontend": "../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "../../../ts/generator-plugin-backbone",
@@ -66,8 +66,8 @@
     "../../../../ts/generator-utils": {
       "extraneous": true
     },
-    "../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -421,7 +421,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "*",
+        "@vaadin/hilla-frontend": "*",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -3410,8 +3410,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9380,8 +9380,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
diff --git a/packages/java/tests/csrf/package.json b/packages/java/tests/csrf/package.json
index 75ea5b4f88..9ff8647d8a 100644
--- a/packages/java/tests/csrf/package.json
+++ b/packages/java/tests/csrf/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "../../../ts/core",
+    "@vaadin/hilla-frontend": "../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "../../../ts/generator-plugin-backbone",
@@ -41,7 +41,7 @@
     "dependencies": {
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -81,7 +81,7 @@
     "lit": "$lit",
     "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/gradle/single-module-tests/package-lock.json b/packages/java/tests/gradle/single-module-tests/package-lock.json
index 68ec264abb..921844d73b 100644
--- a/packages/java/tests/gradle/single-module-tests/package-lock.json
+++ b/packages/java/tests/gradle/single-module-tests/package-lock.json
@@ -12,7 +12,7 @@
         "@vaadin-component-factory/vcf-nav": "1.1.0",
         "@vaadin/bundles": "^24.4.0-alpha3",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -56,8 +56,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0",
       "license": "Apache-2.0",
       "dependencies": {
@@ -410,7 +410,7 @@
       "version": "24.4.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -435,7 +435,7 @@
       "version": "24.4.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0"
+        "@vaadin/hilla-frontend": "24.4.0"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -464,7 +464,7 @@
       "version": "24.4.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "@vaadin/hilla-lit-form": "24.4.0",
         "@vaadin/hilla-react-form": "24.4.0",
         "@vaadin/react-components": "^24.4.0-alpha3",
@@ -4229,8 +4229,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
diff --git a/packages/java/tests/gradle/single-module-tests/package.json b/packages/java/tests/gradle/single-module-tests/package.json
index eabe8df1bd..6632d8d776 100644
--- a/packages/java/tests/gradle/single-module-tests/package.json
+++ b/packages/java/tests/gradle/single-module-tests/package.json
@@ -7,7 +7,7 @@
     "@vaadin-component-factory/vcf-nav": "1.1.0",
     "@vaadin/bundles": "^24.4.0-alpha3",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -71,7 +71,7 @@
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-client": "$@vaadin/hilla-generator-plugin-client",
     "@vaadin/hilla-generator-utils": "$@vaadin/hilla-generator-utils",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-lit-form": "$@vaadin/hilla-lit-form",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
@@ -82,7 +82,7 @@
       "@polymer/polymer": "3.5.1",
       "@vaadin/bundles": "24.4.0",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0",
+      "@vaadin/hilla-frontend": "24.4.0",
       "@vaadin/hilla-generator-cli": "24.4.0",
       "@vaadin/hilla-generator-core": "24.4.0",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0",
diff --git a/packages/java/tests/gradle/single-module/package-lock.json b/packages/java/tests/gradle/single-module/package-lock.json
index 94d88c49c0..282df96c7e 100644
--- a/packages/java/tests/gradle/single-module/package-lock.json
+++ b/packages/java/tests/gradle/single-module/package-lock.json
@@ -13,7 +13,7 @@
         "@vaadin-component-factory/vcf-nav": "1.1.0",
         "@vaadin/bundles": "^24.4.0-alpha3",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -56,8 +56,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -410,7 +410,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -435,7 +435,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -464,7 +464,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "^24.4.0-alpha3",
@@ -4130,8 +4130,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
diff --git a/packages/java/tests/gradle/single-module/package.json b/packages/java/tests/gradle/single-module/package.json
index e5826a4a1a..6d0f75a7a8 100644
--- a/packages/java/tests/gradle/single-module/package.json
+++ b/packages/java/tests/gradle/single-module/package.json
@@ -8,7 +8,7 @@
     "@vaadin-component-factory/vcf-nav": "1.1.0",
     "@vaadin/bundles": "^24.4.0-alpha3",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -67,7 +67,7 @@
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-client": "$@vaadin/hilla-generator-plugin-client",
     "@vaadin/hilla-generator-utils": "$@vaadin/hilla-generator-utils",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-lit-form": "$@vaadin/hilla-lit-form",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
@@ -81,7 +81,7 @@
       "@types/react-dom": "18.2.18",
       "@vaadin/bundles": "24.4.0",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
diff --git a/packages/java/tests/spring/endpoints discovery/package-lock.json b/packages/java/tests/spring/endpoints discovery/package-lock.json
index 7cf6c96f5b..55f5885654 100644
--- a/packages/java/tests/spring/endpoints discovery/package-lock.json	
+++ b/packages/java/tests/spring/endpoints discovery/package-lock.json	
@@ -11,7 +11,7 @@
         "@types/react": "18.2.50",
         "@types/react-dom": "18.2.18",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -50,8 +50,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -405,7 +405,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -430,7 +430,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -455,7 +455,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -484,7 +484,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -3537,8 +3537,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9534,8 +9534,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -9792,7 +9792,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -9813,7 +9813,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -9835,7 +9835,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/endpoints discovery/package.json b/packages/java/tests/spring/endpoints discovery/package.json
index 1cafcb90ff..b6ca6de140 100644
--- a/packages/java/tests/spring/endpoints discovery/package.json	
+++ b/packages/java/tests/spring/endpoints discovery/package.json	
@@ -7,7 +7,7 @@
     "@types/react": "18.2.50",
     "@types/react-dom": "18.2.18",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -51,7 +51,7 @@
       "@types/react": "18.2.50",
       "@types/react-dom": "18.2.18",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -93,7 +93,7 @@
     "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/endpoints-contextpath/package-lock.json b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
index 368baf284d..7a58f5ff14 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package-lock.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package-lock.json
@@ -9,7 +9,7 @@
       "dependencies": {
         "@polymer/polymer": "3.5.1",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -46,8 +46,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -401,7 +401,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -426,7 +426,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -451,7 +451,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -480,7 +480,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -3549,8 +3549,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9371,8 +9371,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -9629,7 +9629,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -9650,7 +9650,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -9672,7 +9672,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/endpoints-contextpath/package.json b/packages/java/tests/spring/endpoints-contextpath/package.json
index e01834a207..62e536b1fb 100644
--- a/packages/java/tests/spring/endpoints-contextpath/package.json
+++ b/packages/java/tests/spring/endpoints-contextpath/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -45,7 +45,7 @@
     "dependencies": {
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -86,7 +86,7 @@
     "lit": "$lit",
     "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/endpoints-custom-client/frontend/connect-client.ts b/packages/java/tests/spring/endpoints-custom-client/frontend/connect-client.ts
index de6b97b98b..c5deab3eb7 100644
--- a/packages/java/tests/spring/endpoints-custom-client/frontend/connect-client.ts
+++ b/packages/java/tests/spring/endpoints-custom-client/frontend/connect-client.ts
@@ -1,4 +1,4 @@
-import { ConnectClient, type MiddlewareContext, type MiddlewareNext } from '@vaadin/hilla-core';
+import { ConnectClient, type MiddlewareContext, type MiddlewareNext } from '@vaadin/hilla-frontend';
 
 async function logger(context: MiddlewareContext, next?: MiddlewareNext): Promise<Response> {
   const start = new Date().getTime();
diff --git a/packages/java/tests/spring/endpoints-custom-client/package-lock.json b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
index 28294117c9..86246cd314 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package-lock.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package-lock.json
@@ -9,7 +9,7 @@
       "dependencies": {
         "@polymer/polymer": "3.5.1",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -46,8 +46,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -401,7 +401,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -426,7 +426,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -451,7 +451,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -480,7 +480,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -3549,8 +3549,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9371,8 +9371,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -9629,7 +9629,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -9650,7 +9650,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -9672,7 +9672,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/endpoints-custom-client/package.json b/packages/java/tests/spring/endpoints-custom-client/package.json
index e01834a207..62e536b1fb 100644
--- a/packages/java/tests/spring/endpoints-custom-client/package.json
+++ b/packages/java/tests/spring/endpoints-custom-client/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -45,7 +45,7 @@
     "dependencies": {
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -86,7 +86,7 @@
     "lit": "$lit",
     "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/endpoints-latest-java/package-lock.json b/packages/java/tests/spring/endpoints-latest-java/package-lock.json
index e5c34dba2c..d8c2995605 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package-lock.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package-lock.json
@@ -11,7 +11,7 @@
         "@types/react": "18.2.50",
         "@types/react-dom": "18.2.18",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -50,8 +50,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -405,7 +405,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -430,7 +430,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -455,7 +455,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -484,7 +484,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -3537,8 +3537,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9534,8 +9534,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -9792,7 +9792,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -9813,7 +9813,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -9835,7 +9835,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/endpoints-latest-java/package.json b/packages/java/tests/spring/endpoints-latest-java/package.json
index 1cafcb90ff..b6ca6de140 100644
--- a/packages/java/tests/spring/endpoints-latest-java/package.json
+++ b/packages/java/tests/spring/endpoints-latest-java/package.json
@@ -7,7 +7,7 @@
     "@types/react": "18.2.50",
     "@types/react-dom": "18.2.18",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -51,7 +51,7 @@
       "@types/react": "18.2.50",
       "@types/react-dom": "18.2.18",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -93,7 +93,7 @@
     "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/endpoints-maven-engine/package-lock.json b/packages/java/tests/spring/endpoints-maven-engine/package-lock.json
index d71047bbbf..e10cbcb25f 100644
--- a/packages/java/tests/spring/endpoints-maven-engine/package-lock.json
+++ b/packages/java/tests/spring/endpoints-maven-engine/package-lock.json
@@ -7,7 +7,7 @@
       "name": "no-name",
       "license": "UNLICENSED",
       "dependencies": {
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -50,7 +50,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "^24.4.0-alpha3",
+        "@vaadin/hilla-frontend": "^24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -70,8 +70,8 @@
         "lit": "^2.3.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "2.4.0-beta2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -419,8 +419,8 @@
         "node": ">= 16.13"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "2.1.0-alpha4",
       "extraneous": true,
       "license": "Apache-2.0",
@@ -454,7 +454,7 @@
       "version": "2.4.0-beta2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "^24.4.0-alpha3"
+        "@vaadin/hilla-frontend": "^24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -484,7 +484,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/hilla-lit-form": "^24.4.0-alpha3",
-        "@vaadin/hilla-core": "^24.4.0-alpha3",
+        "@vaadin/hilla-frontend": "^24.4.0-alpha3",
         "@vaadin/react-components": "^24.4.0-alpha3",
         "@vaadin/hilla-react-form": "^24.4.0-alpha3",
         "@vaadin/vaadin-lumo-styles": "^24.4.0-alpha3"
@@ -2816,8 +2816,8 @@
         "node": ">=12"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -8614,8 +8614,8 @@
       "dev": true,
       "optional": true
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -8866,7 +8866,7 @@
       "version": "file:../../../../ts/react-auth",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
-        "@vaadin/hilla-core": "^24.4.0-alpha3",
+        "@vaadin/hilla-frontend": "^24.4.0-alpha3",
         "@testing-library/react": "^14.0.0",
         "@testing-library/user-event": "^14.5.1",
         "@types/chai": "^4.3.6",
@@ -8888,7 +8888,7 @@
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@vaadin/hilla-lit-form": "^24.4.0-alpha3",
-        "@vaadin/hilla-core": "^24.4.0-alpha3",
+        "@vaadin/hilla-frontend": "^24.4.0-alpha3",
         "@vaadin/react-components": "^24.4.0-alpha3",
         "@vaadin/hilla-react-form": "^24.4.0-alpha3",
         "@testing-library/react": "^14.0.0",
diff --git a/packages/java/tests/spring/endpoints-maven-engine/package.json b/packages/java/tests/spring/endpoints-maven-engine/package.json
index 99cfbfadf9..6e271b1c21 100644
--- a/packages/java/tests/spring/endpoints-maven-engine/package.json
+++ b/packages/java/tests/spring/endpoints-maven-engine/package.json
@@ -3,7 +3,7 @@
   "license": "UNLICENSED",
   "type": "module",
   "dependencies": {
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -41,7 +41,7 @@
   },
   "vaadin": {
     "dependencies": {
-      "@vaadin/hilla-core": "^24.4.0-alpha3",
+      "@vaadin/hilla-frontend": "^24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "^24.4.0-alpha3",
       "@vaadin/hilla-generator-core": "^24.4.0-alpha3",
       "@vaadin/hilla-generator-plugin-backbone": "^24.4.0-alpha3",
@@ -82,7 +82,7 @@
     "lit": "$lit",
     "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/endpoints/frontend/src/test-flux.ts b/packages/java/tests/spring/endpoints/frontend/src/test-flux.ts
index 5daf328f90..ccd469bd09 100644
--- a/packages/java/tests/spring/endpoints/frontend/src/test-flux.ts
+++ b/packages/java/tests/spring/endpoints/frontend/src/test-flux.ts
@@ -1,4 +1,4 @@
-import { Subscription } from '@vaadin/hilla-core';
+import { Subscription } from '@vaadin/hilla-frontend';
 import { LitElement, html } from 'lit';
 import { customElement, query } from 'lit/decorators.js';
 import { FluxEndpoint } from '../generated/endpoints';
diff --git a/packages/java/tests/spring/endpoints/package-lock.json b/packages/java/tests/spring/endpoints/package-lock.json
index ba6fe363fd..918608353f 100644
--- a/packages/java/tests/spring/endpoints/package-lock.json
+++ b/packages/java/tests/spring/endpoints/package-lock.json
@@ -9,7 +9,7 @@
       "dependencies": {
         "@polymer/polymer": "3.5.1",
         "@vaadin/common-frontend": "0.0.19",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -46,8 +46,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -401,7 +401,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -426,7 +426,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -451,7 +451,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -480,7 +480,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -3549,8 +3549,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -9371,8 +9371,8 @@
         "tslib": "^2.3.1"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -9629,7 +9629,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -9650,7 +9650,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -9672,7 +9672,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/endpoints/package.json b/packages/java/tests/spring/endpoints/package.json
index e01834a207..62e536b1fb 100644
--- a/packages/java/tests/spring/endpoints/package.json
+++ b/packages/java/tests/spring/endpoints/package.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "@polymer/polymer": "3.5.1",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -45,7 +45,7 @@
     "dependencies": {
       "@polymer/polymer": "3.5.1",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -86,7 +86,7 @@
     "lit": "$lit",
     "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "$@vaadin/hilla-generator-plugin-backbone",
diff --git a/packages/java/tests/spring/native/frontend/auth.ts b/packages/java/tests/spring/native/frontend/auth.ts
index a581fccc3c..d83b15096a 100644
--- a/packages/java/tests/spring/native/frontend/auth.ts
+++ b/packages/java/tests/spring/native/frontend/auth.ts
@@ -1,4 +1,4 @@
-import { login as _login, logout as _logout } from '@vaadin/hilla-core';
+import { login as _login, logout as _logout } from '@vaadin/hilla-frontend';
 import { AuthenticateThunk, UnauthenticateThunk } from 'Frontend/useAuth.js';
 
 export async function login(username: string, password: string, authenticate: AuthenticateThunk) {
diff --git a/packages/java/tests/spring/native/frontend/views/ChatView.tsx b/packages/java/tests/spring/native/frontend/views/ChatView.tsx
index e46bad2b47..a064bb2c9e 100644
--- a/packages/java/tests/spring/native/frontend/views/ChatView.tsx
+++ b/packages/java/tests/spring/native/frontend/views/ChatView.tsx
@@ -1,5 +1,5 @@
 import {Button} from "@vaadin/react-components/Button.js";
-import {logout} from "@vaadin/hilla-core";
+import {logout} from "@vaadin/hilla-frontend";
 import {MessageList} from "@vaadin/react-components/MessageList.js";
 import {MessageInput} from "@vaadin/react-components/MessageInput.js";
 import {useEffect, useState} from "react";
diff --git a/packages/java/tests/spring/native/package-lock.json b/packages/java/tests/spring/native/package-lock.json
index cc2d844a6f..c2a2420b4f 100644
--- a/packages/java/tests/spring/native/package-lock.json
+++ b/packages/java/tests/spring/native/package-lock.json
@@ -7,7 +7,7 @@
       "name": "no-name",
       "license": "UNLICENSED",
       "dependencies": {
-        "@vaadin/hilla-core": "../../../../ts/core",
+        "@vaadin/hilla-frontend": "../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "../../../../ts/generator-plugin-backbone",
@@ -59,7 +59,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "*",
+        "@vaadin/hilla-frontend": "*",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -358,8 +358,8 @@
         "node": ">= 16.13"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "2.2.0-beta1",
       "license": "Apache-2.0",
       "dependencies": {
@@ -2439,8 +2439,8 @@
         "node": ">=12"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
diff --git a/packages/java/tests/spring/native/package.json b/packages/java/tests/spring/native/package.json
index 1f00fab36f..ea5c019fba 100644
--- a/packages/java/tests/spring/native/package.json
+++ b/packages/java/tests/spring/native/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "dependencies": {
     "@vaadin/hilla-lit-form": "file:../../../../ts/lit-form",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -55,7 +55,7 @@
   },
   "vaadin": {
     "dependencies": {
-      "@vaadin/hilla-core": "24.4.0-alpha3",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha3",
       "@vaadin/hilla-generator-core": "24.4.0-alpha3",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha3",
@@ -110,7 +110,7 @@
     "@vaadin/hilla-generator-plugin-client": "$@vaadin/hilla-generator-plugin-client",
     "@vaadin/tooltip": "$@vaadin/tooltip",
     "@vaadin/hilla-generator-utils": "$@vaadin/hilla-generator-utils",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/icons": "$@vaadin/icons",
     "@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
     "@vaadin/vaadin-themable-mixin": "$@vaadin/vaadin-themable-mixin",
diff --git a/packages/java/tests/spring/react-grid-test/package.json b/packages/java/tests/spring/react-grid-test/package.json
index be77d02301..b507a76638 100644
--- a/packages/java/tests/spring/react-grid-test/package.json
+++ b/packages/java/tests/spring/react-grid-test/package.json
@@ -8,7 +8,7 @@
     "@types/react-dom": "18.2.18",
     "@vaadin/bundles": "24.4.0-alpha10",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -54,7 +54,7 @@
       "@types/react-dom": "18.2.18",
       "@vaadin/bundles": "24.4.0-alpha10",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -111,7 +111,7 @@
     "@vaadin/hilla-react-crud": "$@vaadin/hilla-react-crud",
     "react-router-dom": "$react-router-dom",
     "@vaadin/hilla-react-auth": "$@vaadin/hilla-react-auth",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "@vaadin/hilla-generator-plugin-subtypes": "$@vaadin/hilla-generator-plugin-subtypes",
     "react-dom": "$react-dom",
     "@types/react-dom": "$@types/react-dom",
diff --git a/packages/java/tests/spring/security-contextpath/package-lock.json b/packages/java/tests/spring/security-contextpath/package-lock.json
index ada6fd5db9..af6b13516f 100644
--- a/packages/java/tests/spring/security-contextpath/package-lock.json
+++ b/packages/java/tests/spring/security-contextpath/package-lock.json
@@ -43,7 +43,7 @@
         "@vaadin/form-layout": "24.4.0-alpha10",
         "@vaadin/grid": "24.4.0-alpha10",
         "@vaadin/grid-pro": "24.4.0-alpha10",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -120,8 +120,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -515,7 +515,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -540,7 +540,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -565,7 +565,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -594,7 +594,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -4351,8 +4351,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -11160,8 +11160,8 @@
         "lit": "3.1.2"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -11466,7 +11466,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -11487,7 +11487,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -11509,7 +11509,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/security-contextpath/package.json b/packages/java/tests/spring/security-contextpath/package.json
index 966b67d115..6abdff95d8 100644
--- a/packages/java/tests/spring/security-contextpath/package.json
+++ b/packages/java/tests/spring/security-contextpath/package.json
@@ -39,7 +39,7 @@
     "@vaadin/form-layout": "24.4.0-alpha10",
     "@vaadin/grid": "24.4.0-alpha10",
     "@vaadin/grid-pro": "24.4.0-alpha10",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -148,7 +148,7 @@
       "@vaadin/form-layout": "24.4.0-alpha10",
       "@vaadin/grid": "24.4.0-alpha10",
       "@vaadin/grid-pro": "24.4.0-alpha10",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -234,7 +234,7 @@
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
     "@adobe/lit-mobx": "$@adobe/lit-mobx",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "mobx": "$mobx",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
diff --git a/packages/java/tests/spring/security-jwt/package-lock.json b/packages/java/tests/spring/security-jwt/package-lock.json
index 8ac8bf6e61..89f7205386 100644
--- a/packages/java/tests/spring/security-jwt/package-lock.json
+++ b/packages/java/tests/spring/security-jwt/package-lock.json
@@ -43,7 +43,7 @@
         "@vaadin/form-layout": "24.4.0-alpha10",
         "@vaadin/grid": "24.4.0-alpha10",
         "@vaadin/grid-pro": "24.4.0-alpha10",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -120,8 +120,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -510,7 +510,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -535,7 +535,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -560,7 +560,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -589,7 +589,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -4346,8 +4346,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -11155,8 +11155,8 @@
         "lit": "3.1.2"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -11455,7 +11455,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -11476,7 +11476,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -11498,7 +11498,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/security-jwt/package.json b/packages/java/tests/spring/security-jwt/package.json
index b42ac2ffe7..a7ac5c206a 100644
--- a/packages/java/tests/spring/security-jwt/package.json
+++ b/packages/java/tests/spring/security-jwt/package.json
@@ -39,7 +39,7 @@
     "@vaadin/form-layout": "24.4.0-alpha10",
     "@vaadin/grid": "24.4.0-alpha10",
     "@vaadin/grid-pro": "24.4.0-alpha10",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -148,7 +148,7 @@
       "@vaadin/form-layout": "24.4.0-alpha10",
       "@vaadin/grid": "24.4.0-alpha10",
       "@vaadin/grid-pro": "24.4.0-alpha10",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -295,7 +295,7 @@
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
     "@adobe/lit-mobx": "$@adobe/lit-mobx",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "mobx": "$mobx",
     "@vaadin/lit-renderer": "$@vaadin/lit-renderer",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
diff --git a/packages/java/tests/spring/security-urlmapping/frontend/connect-client.ts b/packages/java/tests/spring/security-urlmapping/frontend/connect-client.ts
index f1746719ed..7efbf21555 100644
--- a/packages/java/tests/spring/security-urlmapping/frontend/connect-client.ts
+++ b/packages/java/tests/spring/security-urlmapping/frontend/connect-client.ts
@@ -1,4 +1,4 @@
-import { ConnectClient, InvalidSessionMiddleware } from '@vaadin/hilla-core';
+import { ConnectClient, InvalidSessionMiddleware } from '@vaadin/hilla-frontend';
 
 const client = new ConnectClient({
   prefix: '../connect',
diff --git a/packages/java/tests/spring/security-urlmapping/package-lock.json b/packages/java/tests/spring/security-urlmapping/package-lock.json
index 5b9fdd59ad..fdfb6a616a 100644
--- a/packages/java/tests/spring/security-urlmapping/package-lock.json
+++ b/packages/java/tests/spring/security-urlmapping/package-lock.json
@@ -43,7 +43,7 @@
         "@vaadin/form-layout": "24.4.0-alpha10",
         "@vaadin/grid": "24.4.0-alpha10",
         "@vaadin/grid-pro": "24.4.0-alpha10",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -120,8 +120,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -515,7 +515,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -540,7 +540,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -565,7 +565,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -594,7 +594,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -4343,8 +4343,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -11136,8 +11136,8 @@
         "lit": "3.1.2"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -11442,7 +11442,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -11463,7 +11463,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -11485,7 +11485,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/security-urlmapping/package.json b/packages/java/tests/spring/security-urlmapping/package.json
index b42ac2ffe7..a7ac5c206a 100644
--- a/packages/java/tests/spring/security-urlmapping/package.json
+++ b/packages/java/tests/spring/security-urlmapping/package.json
@@ -39,7 +39,7 @@
     "@vaadin/form-layout": "24.4.0-alpha10",
     "@vaadin/grid": "24.4.0-alpha10",
     "@vaadin/grid-pro": "24.4.0-alpha10",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -148,7 +148,7 @@
       "@vaadin/form-layout": "24.4.0-alpha10",
       "@vaadin/grid": "24.4.0-alpha10",
       "@vaadin/grid-pro": "24.4.0-alpha10",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -295,7 +295,7 @@
     "lit": "$lit",
     "@polymer/polymer": "$@polymer/polymer",
     "@adobe/lit-mobx": "$@adobe/lit-mobx",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "mobx": "$mobx",
     "@vaadin/lit-renderer": "$@vaadin/lit-renderer",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
diff --git a/packages/java/tests/spring/security/frontend/auth.ts b/packages/java/tests/spring/security/frontend/auth.ts
index d7d984e028..c999b33d29 100644
--- a/packages/java/tests/spring/security/frontend/auth.ts
+++ b/packages/java/tests/spring/security/frontend/auth.ts
@@ -1,5 +1,5 @@
 // Uses the Vaadin provided login an logout helper methods
-import { login as loginImpl, LoginResult, logout as logoutImpl } from '@vaadin/hilla-core';
+import { login as loginImpl, LoginResult, logout as logoutImpl } from '@vaadin/hilla-frontend';
 import { appStore } from './stores/app-store';
 
 interface Authentication {
diff --git a/packages/java/tests/spring/security/frontend/connect-client.ts b/packages/java/tests/spring/security/frontend/connect-client.ts
index 2308c07d42..0c64147b10 100644
--- a/packages/java/tests/spring/security/frontend/connect-client.ts
+++ b/packages/java/tests/spring/security/frontend/connect-client.ts
@@ -1,4 +1,4 @@
-import { ConnectClient, InvalidSessionMiddleware } from '@vaadin/hilla-core';
+import { ConnectClient, InvalidSessionMiddleware } from '@vaadin/hilla-frontend';
 
 const client = new ConnectClient({
   prefix: 'connect',
diff --git a/packages/java/tests/spring/security/frontend/views/login-view.ts b/packages/java/tests/spring/security/frontend/views/login-view.ts
index 444d67f04a..977888ef83 100644
--- a/packages/java/tests/spring/security/frontend/views/login-view.ts
+++ b/packages/java/tests/spring/security/frontend/views/login-view.ts
@@ -1,4 +1,4 @@
-import { LoginResult } from '@vaadin/hilla-core';
+import { LoginResult } from '@vaadin/hilla-frontend';
 import { AfterEnterObserver, RouterLocation } from '@vaadin/router';
 import '@vaadin/login/vaadin-login-overlay';
 import { html } from 'lit';
diff --git a/packages/java/tests/spring/security/package-lock.json b/packages/java/tests/spring/security/package-lock.json
index 6384d9c03b..173d58a141 100644
--- a/packages/java/tests/spring/security/package-lock.json
+++ b/packages/java/tests/spring/security/package-lock.json
@@ -38,7 +38,7 @@
         "@vaadin/form-layout": "24.4.0-alpha10",
         "@vaadin/grid": "24.4.0-alpha10",
         "@vaadin/grid-pro": "24.4.0-alpha10",
-        "@vaadin/hilla-core": "file:../../../../ts/core",
+        "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
         "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
         "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
         "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -115,8 +115,8 @@
         "workbox-precaching": "7.0.0"
       }
     },
-    "../../../../ts/core": {
-      "name": "@vaadin/hilla-core",
+    "../../../../ts/frontend": {
+      "name": "@vaadin/hilla-frontend",
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
@@ -510,7 +510,7 @@
       "extraneous": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0",
+        "@vaadin/hilla-frontend": "24.4.0",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -535,7 +535,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -560,7 +560,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2"
+        "@vaadin/hilla-frontend": "24.4.0-alpha3"
       },
       "devDependencies": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -589,7 +589,7 @@
       "version": "24.4.0-alpha2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10"
@@ -4276,8 +4276,8 @@
         "lit": "^3.0.0"
       }
     },
-    "node_modules/@vaadin/hilla-core": {
-      "resolved": "../../../../ts/core",
+    "node_modules/@vaadin/hilla-frontend": {
+      "resolved": "../../../../ts/frontend",
       "link": true
     },
     "node_modules/@vaadin/hilla-generator-cli": {
@@ -11015,8 +11015,8 @@
         "lit": "3.1.2"
       }
     },
-    "@vaadin/hilla-core": {
-      "version": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": {
+      "version": "file:../../../../ts/frontend",
       "requires": {
         "@esm-bundle/chai": "^4.3.4-fix.0",
         "@open-wc/testing": "^3.2.0",
@@ -11321,7 +11321,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "sinon": "^16.0.0",
         "sinon-chai": "^3.7.0",
@@ -11342,7 +11342,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "chai-dom": "^1.11.0",
         "react-router-dom": "^6.16.0",
         "sinon": "^16.0.0",
@@ -11364,7 +11364,7 @@
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
         "@types/validator": "^13.11.2",
-        "@vaadin/hilla-core": "24.4.0-alpha2",
+        "@vaadin/hilla-frontend": "24.4.0-alpha3",
         "@vaadin/hilla-lit-form": "24.4.0-alpha2",
         "@vaadin/hilla-react-form": "24.4.0-alpha2",
         "@vaadin/react-components": "24.4.0-alpha10",
diff --git a/packages/java/tests/spring/security/package.json b/packages/java/tests/spring/security/package.json
index 4c68898290..75b6ce3b22 100644
--- a/packages/java/tests/spring/security/package.json
+++ b/packages/java/tests/spring/security/package.json
@@ -34,7 +34,7 @@
     "@vaadin/form-layout": "24.4.0-alpha10",
     "@vaadin/grid": "24.4.0-alpha10",
     "@vaadin/grid-pro": "24.4.0-alpha10",
-    "@vaadin/hilla-core": "file:../../../../ts/core",
+    "@vaadin/hilla-frontend": "file:../../../../ts/frontend",
     "@vaadin/hilla-generator-cli": "file:../../../../ts/generator-cli",
     "@vaadin/hilla-generator-core": "file:../../../../ts/generator-core",
     "@vaadin/hilla-generator-plugin-backbone": "file:../../../../ts/generator-plugin-backbone",
@@ -143,7 +143,7 @@
       "@vaadin/form-layout": "24.4.0-alpha10",
       "@vaadin/grid": "24.4.0-alpha10",
       "@vaadin/grid-pro": "24.4.0-alpha10",
-      "@vaadin/hilla-core": "24.4.0-alpha2",
+      "@vaadin/hilla-frontend": "24.4.0-alpha3",
       "@vaadin/hilla-generator-cli": "24.4.0-alpha2",
       "@vaadin/hilla-generator-core": "24.4.0-alpha2",
       "@vaadin/hilla-generator-plugin-backbone": "24.4.0-alpha2",
@@ -229,7 +229,7 @@
     "@vaadin/polymer-legacy-adapter": "$@vaadin/polymer-legacy-adapter",
     "@vaadin/vaadin-lumo-styles": "$@vaadin/vaadin-lumo-styles",
     "@adobe/lit-mobx": "$@adobe/lit-mobx",
-    "@vaadin/hilla-core": "$@vaadin/hilla-core",
+    "@vaadin/hilla-frontend": "$@vaadin/hilla-frontend",
     "mobx": "$mobx",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
     "@vaadin/hilla-generator-core": "$@vaadin/hilla-generator-core",
diff --git a/packages/ts/core/.eslintrc b/packages/ts/frontend/.eslintrc
similarity index 100%
rename from packages/ts/core/.eslintrc
rename to packages/ts/frontend/.eslintrc
diff --git a/packages/ts/core/.lintstagedrc.js b/packages/ts/frontend/.lintstagedrc.js
similarity index 100%
rename from packages/ts/core/.lintstagedrc.js
rename to packages/ts/frontend/.lintstagedrc.js
diff --git a/packages/ts/core/LICENSE b/packages/ts/frontend/LICENSE
similarity index 100%
rename from packages/ts/core/LICENSE
rename to packages/ts/frontend/LICENSE
diff --git a/packages/ts/core/README.md b/packages/ts/frontend/README.md
similarity index 85%
rename from packages/ts/core/README.md
rename to packages/ts/frontend/README.md
index d3e034e5a8..dcde89677f 100644
--- a/packages/ts/core/README.md
+++ b/packages/ts/frontend/README.md
@@ -2,7 +2,7 @@
 
 [API documentation ↗](https://hilla.dev/docs/tutorials/in-depth-course/login-and-authentication)
 
-[![Latest Stable Version](https://img.shields.io/npm/v/@hilla/frontend.svg)](https://www.npmjs.com/package/@vaadin/hilla-core)
+[![Latest Stable Version](https://img.shields.io/npm/v/@hilla/frontend.svg)](https://www.npmjs.com/package/@vaadin/hilla-frontend)
 
 A set of utilities to interact with the [Hilla](https://hilla.dev/docs/) application server.
 A part of the Hilla project.
@@ -12,13 +12,13 @@ A part of the Hilla project.
 **NOTE**: This package is not supposed to used separately from the Hilla project.
 
 ```bash
-$ npm install @vaadin/hilla-core
+$ npm install @vaadin/hilla-frontend
 ```
 
 Once installed, import it in your application:
 
 ```js
-import {login} from '@vaadin/hilla-core';
+import {login} from '@vaadin/hilla-frontend';
 ```
 
 ## Contribution
diff --git a/packages/ts/core/package.json b/packages/ts/frontend/package.json
similarity index 96%
rename from packages/ts/core/package.json
rename to packages/ts/frontend/package.json
index ccc1b6abe0..d831922b5a 100644
--- a/packages/ts/core/package.json
+++ b/packages/ts/frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@vaadin/hilla-core",
+  "name": "@vaadin/hilla-frontend",
   "version": "24.4.0-alpha3",
   "description": "Hilla core frontend utils",
   "main": "index.js",
@@ -8,7 +8,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/vaadin/hilla.git",
-    "directory": "packages/ts/core"
+    "directory": "packages/ts/frontend"
   },
   "keywords": [
     "Hilla"
diff --git a/packages/ts/core/src/Authentication.ts b/packages/ts/frontend/src/Authentication.ts
similarity index 100%
rename from packages/ts/core/src/Authentication.ts
rename to packages/ts/frontend/src/Authentication.ts
diff --git a/packages/ts/core/src/Connect.ts b/packages/ts/frontend/src/Connect.ts
similarity index 100%
rename from packages/ts/core/src/Connect.ts
rename to packages/ts/frontend/src/Connect.ts
diff --git a/packages/ts/core/src/CookieManager.ts b/packages/ts/frontend/src/CookieManager.ts
similarity index 100%
rename from packages/ts/core/src/CookieManager.ts
rename to packages/ts/frontend/src/CookieManager.ts
diff --git a/packages/ts/core/src/CsrfUtils.ts b/packages/ts/frontend/src/CsrfUtils.ts
similarity index 100%
rename from packages/ts/core/src/CsrfUtils.ts
rename to packages/ts/frontend/src/CsrfUtils.ts
diff --git a/packages/ts/core/src/EndpointErrors.ts b/packages/ts/frontend/src/EndpointErrors.ts
similarity index 100%
rename from packages/ts/core/src/EndpointErrors.ts
rename to packages/ts/frontend/src/EndpointErrors.ts
diff --git a/packages/ts/core/src/FluxConnection.ts b/packages/ts/frontend/src/FluxConnection.ts
similarity index 100%
rename from packages/ts/core/src/FluxConnection.ts
rename to packages/ts/frontend/src/FluxConnection.ts
diff --git a/packages/ts/core/src/FluxMessages.ts b/packages/ts/frontend/src/FluxMessages.ts
similarity index 100%
rename from packages/ts/core/src/FluxMessages.ts
rename to packages/ts/frontend/src/FluxMessages.ts
diff --git a/packages/ts/core/src/index.ts b/packages/ts/frontend/src/index.ts
similarity index 100%
rename from packages/ts/core/src/index.ts
rename to packages/ts/frontend/src/index.ts
diff --git a/packages/ts/core/src/types.d.ts b/packages/ts/frontend/src/types.d.ts
similarity index 100%
rename from packages/ts/core/src/types.d.ts
rename to packages/ts/frontend/src/types.d.ts
diff --git a/packages/ts/core/test/Authentication.test.ts b/packages/ts/frontend/test/Authentication.test.ts
similarity index 99%
rename from packages/ts/core/test/Authentication.test.ts
rename to packages/ts/frontend/test/Authentication.test.ts
index 3fe53b4f0e..5df954e93b 100644
--- a/packages/ts/core/test/Authentication.test.ts
+++ b/packages/ts/frontend/test/Authentication.test.ts
@@ -31,7 +31,7 @@ const base = window.location.origin;
 
 const JWT_COOKIE_NAME = 'jwt.headerAndPayload';
 
-describe('@vaadin/hilla-core', () => {
+describe('@vaadin/hilla-frontend', () => {
   describe('Authentication', () => {
     const requestHeaders: Record<string, string> = {};
     const vaadinCsrfToken = '6a60700e-852b-420f-a126-a1c61b73d1ba';
diff --git a/packages/ts/core/test/Connect.test.ts b/packages/ts/frontend/test/Connect.test.ts
similarity index 99%
rename from packages/ts/core/test/Connect.test.ts
rename to packages/ts/frontend/test/Connect.test.ts
index cbef25647e..ade3e080ca 100644
--- a/packages/ts/core/test/Connect.test.ts
+++ b/packages/ts/frontend/test/Connect.test.ts
@@ -40,7 +40,7 @@ interface TestVaadinWindow extends Window {
 
 const $wnd = window as TestVaadinWindow;
 
-describe('@vaadin/hilla-core', () => {
+describe('@vaadin/hilla-frontend', () => {
   describe('ConnectClient', () => {
     let myMiddleware: MiddlewareFunction;
 
diff --git a/packages/ts/core/test/CookieManager.test.ts b/packages/ts/frontend/test/CookieManager.test.ts
similarity index 92%
rename from packages/ts/core/test/CookieManager.test.ts
rename to packages/ts/frontend/test/CookieManager.test.ts
index ab4575e834..20d476b46a 100644
--- a/packages/ts/core/test/CookieManager.test.ts
+++ b/packages/ts/frontend/test/CookieManager.test.ts
@@ -1,7 +1,7 @@
 import { expect } from '@esm-bundle/chai';
 import { calculatePath } from '../src/CookieManager.js';
 
-describe('@vaadin/hilla-core', () => {
+describe('@vaadin/hilla-frontend', () => {
   describe('CookieManager', () => {
     describe('calculatePath', () => {
       let base: URL;
diff --git a/packages/ts/core/test/FluxConnection.test.ts b/packages/ts/frontend/test/FluxConnection.test.ts
similarity index 99%
rename from packages/ts/core/test/FluxConnection.test.ts
rename to packages/ts/frontend/test/FluxConnection.test.ts
index 2bdcbcbdb3..fef6d7bb5d 100644
--- a/packages/ts/core/test/FluxConnection.test.ts
+++ b/packages/ts/frontend/test/FluxConnection.test.ts
@@ -10,7 +10,7 @@ import type {
 } from '../src/FluxMessages.js';
 import { getSubscriptionEventSpies, subscribeStub } from './mocks/atmosphere.js';
 
-describe('@vaadin/hilla-core', () => {
+describe('@vaadin/hilla-frontend', () => {
   describe('FluxConnection', () => {
     function emitMessage(msg: AbstractMessage) {
       getSubscriptionEventSpies()?.onMessage?.({ responseBody: JSON.stringify(msg) });
diff --git a/packages/ts/core/test/SpringCsrfTestUtils.test.ts b/packages/ts/frontend/test/SpringCsrfTestUtils.test.ts
similarity index 100%
rename from packages/ts/core/test/SpringCsrfTestUtils.test.ts
rename to packages/ts/frontend/test/SpringCsrfTestUtils.test.ts
diff --git a/packages/ts/core/test/mocks/FluxConnection.ts b/packages/ts/frontend/test/mocks/FluxConnection.ts
similarity index 100%
rename from packages/ts/core/test/mocks/FluxConnection.ts
rename to packages/ts/frontend/test/mocks/FluxConnection.ts
diff --git a/packages/ts/core/test/mocks/atmosphere.ts b/packages/ts/frontend/test/mocks/atmosphere.ts
similarity index 100%
rename from packages/ts/core/test/mocks/atmosphere.ts
rename to packages/ts/frontend/test/mocks/atmosphere.ts
diff --git a/packages/ts/core/test/mocks/config.json b/packages/ts/frontend/test/mocks/config.json
similarity index 100%
rename from packages/ts/core/test/mocks/config.json
rename to packages/ts/frontend/test/mocks/config.json
diff --git a/packages/ts/core/tsconfig.build.json b/packages/ts/frontend/tsconfig.build.json
similarity index 100%
rename from packages/ts/core/tsconfig.build.json
rename to packages/ts/frontend/tsconfig.build.json
diff --git a/packages/ts/core/tsconfig.json b/packages/ts/frontend/tsconfig.json
similarity index 100%
rename from packages/ts/core/tsconfig.json
rename to packages/ts/frontend/tsconfig.json
diff --git a/packages/ts/generator-plugin-backbone/src/EndpointMethodOperationProcessor.ts b/packages/ts/generator-plugin-backbone/src/EndpointMethodOperationProcessor.ts
index bb489e7fa1..7da87c8c80 100644
--- a/packages/ts/generator-plugin-backbone/src/EndpointMethodOperationProcessor.ts
+++ b/packages/ts/generator-plugin-backbone/src/EndpointMethodOperationProcessor.ts
@@ -12,7 +12,7 @@ import EndpointMethodResponseProcessor from './EndpointMethodResponseProcessor.j
 export type EndpointMethodOperation = ReadonlyDeep<OpenAPIV3.OperationObject>;
 
 export const INIT_TYPE_NAME = 'EndpointRequestInit';
-export const HILLA_FRONTEND_NAME = '@vaadin/hilla-core';
+export const HILLA_FRONTEND_NAME = '@vaadin/hilla-frontend';
 
 export default abstract class EndpointMethodOperationProcessor {
   static createProcessor(
diff --git a/packages/ts/generator-plugin-backbone/test/complex-hierarchy/fixtures/ComplexHierarchyEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/complex-hierarchy/fixtures/ComplexHierarchyEndpoint.snap.ts
index 3c8da8b30e..a85683a272 100644
--- a/packages/ts/generator-plugin-backbone/test/complex-hierarchy/fixtures/ComplexHierarchyEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/complex-hierarchy/fixtures/ComplexHierarchyEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type ComplexHierarchyModel_1 from "./com/vaadin/hilla/parser/plugins/backbone/complexhierarchy/models/ComplexHierarchyModel.js";
 import client_1 from "./connect-client.default.js";
 async function getModel_1(init?: EndpointRequestInit_1): Promise<ComplexHierarchyModel_1 | undefined> { return client_1.call("ComplexHierarchyEndpoint", "getModel", {}, init); }
diff --git a/packages/ts/generator-plugin-backbone/test/complex-type/fixtures/ComplexTypeEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/complex-type/fixtures/ComplexTypeEndpoint.snap.ts
index 023d67d05f..0db3c867a7 100644
--- a/packages/ts/generator-plugin-backbone/test/complex-type/fixtures/ComplexTypeEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/complex-type/fixtures/ComplexTypeEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type ComplexTypeModel_1 from "./com/vaadin/hilla/parser/plugins/backbone/complextype/ComplexTypeEndpoint/ComplexTypeModel.js";
 import client_1 from "./connect-client.default.js";
 async function getComplexTypeModel_1(data: Array<Record<string, string | undefined> | undefined> | undefined, init?: EndpointRequestInit_1): Promise<ComplexTypeModel_1 | undefined> { return client_1.call("ComplexTypeEndpoint", "getComplexTypeModel", { data }, init); }
diff --git a/packages/ts/generator-plugin-backbone/test/custom-client/fixtures/CustomClientEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/custom-client/fixtures/CustomClientEndpoint.snap.ts
index 5127e96500..a2c8fb3e40 100644
--- a/packages/ts/generator-plugin-backbone/test/custom-client/fixtures/CustomClientEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/custom-client/fixtures/CustomClientEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import client_1 from "../connect-client.js";
 async function getString_1(init?: EndpointRequestInit_1): Promise<string | undefined> { return client_1.call("CustomClientEndpoint", "getString", {}, init); }
 export { getString_1 as getString };
diff --git a/packages/ts/generator-plugin-backbone/test/enum-type/fixtures/EnumTypeEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/enum-type/fixtures/EnumTypeEndpoint.snap.ts
index 10baf2e062..f280c9d4ff 100644
--- a/packages/ts/generator-plugin-backbone/test/enum-type/fixtures/EnumTypeEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/enum-type/fixtures/EnumTypeEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type EnumEntity_1 from "./com/vaadin/hilla/parser/plugins/backbone/enumtype/EnumTypeEndpoint/EnumEntity.js";
 import client_1 from "./connect-client.default.js";
 async function echoEnum_1(value: EnumEntity_1 | undefined, init?: EndpointRequestInit_1): Promise<EnumEntity_1 | undefined> { return client_1.call("EnumTypeEndpoint", "echoEnum", { value }, init); }
diff --git a/packages/ts/generator-plugin-backbone/test/hierarchy-ref/fixtures/HierarchyRefEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/hierarchy-ref/fixtures/HierarchyRefEndpoint.snap.ts
index f2287dd310..91f701cb29 100644
--- a/packages/ts/generator-plugin-backbone/test/hierarchy-ref/fixtures/HierarchyRefEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/hierarchy-ref/fixtures/HierarchyRefEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type HierarchyRef_1 from "./com/vaadin/hilla/parser/plugins/backbone/hierarchyref/HierarchyRefEndpoint/HierarchyRef.js";
 import client_1 from "./connect-client.default.js";
 async function getHierarchyRef_1(data: Array<Record<string, string | undefined> | undefined> | undefined, init?: EndpointRequestInit_1): Promise<HierarchyRef_1 | undefined> { return client_1.call("HierarchyRefEndpoint", "getHierarchyRef", { data }, init); }
diff --git a/packages/ts/generator-plugin-backbone/test/name-clash/fixtures/NameClashEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/name-clash/fixtures/NameClashEndpoint.snap.ts
index 0a07a3c719..7d269f19d8 100644
--- a/packages/ts/generator-plugin-backbone/test/name-clash/fixtures/NameClashEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/name-clash/fixtures/NameClashEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import client_1 from "./connect-client.default.js";
 async function getOneParam_1(init: string, _init?: EndpointRequestInit_1): Promise<string> { return client_1.call("NameClashEndpoint", "getOneParam", { init }, _init); }
 async function getTwoParams_1(init: string, _init: string, __init?: EndpointRequestInit_1): Promise<string> { return client_1.call("NameClashEndpoint", "getTwoParams", { init, _init }, __init); }
diff --git a/packages/ts/generator-plugin-backbone/test/no-properties/fixtures/NoPropertiesEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/no-properties/fixtures/NoPropertiesEndpoint.snap.ts
index a5ed11b876..ded999288a 100644
--- a/packages/ts/generator-plugin-backbone/test/no-properties/fixtures/NoPropertiesEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/no-properties/fixtures/NoPropertiesEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type ExampleEntity_1 from "./com/example/application/entities/ExampleEntity.js";
 import client_1 from "./connect-client.default.js";
 async function sayHello_1(id: ExampleEntity_1, init?: EndpointRequestInit_1): Promise<string> { return client_1.call("NoPropertiesEndpoint", "sayHello", { id }, init); }
diff --git a/packages/ts/generator-plugin-backbone/test/simple-type/fixtures/SimpleTypeEndpoint.snap.ts b/packages/ts/generator-plugin-backbone/test/simple-type/fixtures/SimpleTypeEndpoint.snap.ts
index cc9364f252..d85d725b1e 100644
--- a/packages/ts/generator-plugin-backbone/test/simple-type/fixtures/SimpleTypeEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-backbone/test/simple-type/fixtures/SimpleTypeEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import client_1 from "./connect-client.default.js";
 async function getArray_1(init?: EndpointRequestInit_1): Promise<Array<number> | undefined> { return client_1.call("SimpleTypeEndpoint", "getArray", {}, init); }
 async function getBigDecimal_1(init?: EndpointRequestInit_1): Promise<number | undefined> { return client_1.call("SimpleTypeEndpoint", "getBigDecimal", {}, init); }
diff --git a/packages/ts/generator-plugin-client/src/ClientProcessor.ts b/packages/ts/generator-plugin-client/src/ClientProcessor.ts
index 196680d647..d15f047f5a 100644
--- a/packages/ts/generator-plugin-client/src/ClientProcessor.ts
+++ b/packages/ts/generator-plugin-client/src/ClientProcessor.ts
@@ -18,7 +18,10 @@ export default class ClientProcessor {
     this.#owner.logger.debug(`Generating ${this.#outputPath}`);
 
     const { exports, imports, paths } = new DependencyManager(new PathManager({ extension: '.js' }));
-    const clientClassId = imports.named.add(paths.createBareModulePath('@vaadin/hilla-core', false), 'ConnectClient');
+    const clientClassId = imports.named.add(
+      paths.createBareModulePath('@vaadin/hilla-frontend', false),
+      'ConnectClient',
+    );
 
     const clientVarId = createFullyUniqueIdentifier('client');
     exports.default.set(clientVarId);
diff --git a/packages/ts/generator-plugin-client/test/basic/fixtures/client.snap.ts b/packages/ts/generator-plugin-client/test/basic/fixtures/client.snap.ts
index 5ca29b7886..bdcaa46080 100644
--- a/packages/ts/generator-plugin-client/test/basic/fixtures/client.snap.ts
+++ b/packages/ts/generator-plugin-client/test/basic/fixtures/client.snap.ts
@@ -1,3 +1,3 @@
-import { ConnectClient as ConnectClient_1 } from "@vaadin/hilla-core";
+import { ConnectClient as ConnectClient_1 } from "@vaadin/hilla-frontend";
 const client_1 = new ConnectClient_1({ prefix: "connect" });
 export default client_1;
diff --git a/packages/ts/generator-plugin-push/src/PushProcessor.ts b/packages/ts/generator-plugin-push/src/PushProcessor.ts
index fb60718266..d7b7d1fbe9 100644
--- a/packages/ts/generator-plugin-push/src/PushProcessor.ts
+++ b/packages/ts/generator-plugin-push/src/PushProcessor.ts
@@ -25,7 +25,7 @@ export class PushProcessor {
 
     this.#dependencies.imports.fromCode(source);
     this.#subscriptionId = memoize(() =>
-      imports.named.add(paths.createBareModulePath('@vaadin/hilla-core', false), 'Subscription'),
+      imports.named.add(paths.createBareModulePath('@vaadin/hilla-frontend', false), 'Subscription'),
     );
   }
 
@@ -51,7 +51,7 @@ export class PushProcessor {
       const importHillaCore = importStatements.find(
         (statement) =>
           ts.isImportDeclaration(statement) &&
-          (statement.moduleSpecifier as ts.StringLiteral).text === '@vaadin/hilla-core',
+          (statement.moduleSpecifier as ts.StringLiteral).text === '@vaadin/hilla-frontend',
       );
 
       if (importHillaCore) {
diff --git a/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeEndpoint.snap.ts b/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeEndpoint.snap.ts
index c0c24767c0..900efb74ef 100644
--- a/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1, Subscription as Subscription_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1, Subscription as Subscription_1 } from "@vaadin/hilla-frontend";
 import client_1 from "./connect-client.default.js";
 function getMessageFlux_1(): Subscription_1<string | undefined> { return client_1.subscribe("PushTypeEndpoint", "getMessageFlux", {}); }
 function getNonNullMessageFlux_1(): Subscription_1<string> { return client_1.subscribe("PushTypeEndpoint", "getNonNullMessageFlux", {}); }
diff --git a/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeOnlyEndpoint.snap.ts b/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeOnlyEndpoint.snap.ts
index 80f900e8cb..22f0c37c7a 100644
--- a/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeOnlyEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-push/test/push-type/fixtures/PushTypeOnlyEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { Subscription as Subscription_1 } from "@vaadin/hilla-core";
+import { Subscription as Subscription_1 } from "@vaadin/hilla-frontend";
 import client_1 from "./connect-client.default.js";
 function getMessageFlux_1(): Subscription_1<string | undefined> { return client_1.subscribe("PushTypeOnlyEndpoint", "getMessageFlux", {}); }
 function getNonNullMessageFlux_1(): Subscription_1<string> { return client_1.subscribe("PushTypeOnlyEndpoint", "getNonNullMessageFlux", {}); }
diff --git a/packages/ts/generator-plugin-subtypes/test/push-type/fixtures/SubTypesEndpoint.snap.ts b/packages/ts/generator-plugin-subtypes/test/push-type/fixtures/SubTypesEndpoint.snap.ts
index c406fcef74..907909045b 100644
--- a/packages/ts/generator-plugin-subtypes/test/push-type/fixtures/SubTypesEndpoint.snap.ts
+++ b/packages/ts/generator-plugin-subtypes/test/push-type/fixtures/SubTypesEndpoint.snap.ts
@@ -1,4 +1,4 @@
-import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-core";
+import { EndpointRequestInit as EndpointRequestInit_1 } from "@vaadin/hilla-frontend";
 import type BaseEvent_1 from "./com/vaadin/hilla/parser/plugins/subtypes/BaseEvent.js";
 import client_1 from "./connect-client.default.js";
 async function receiveEvent_1(event: BaseEvent_1 | undefined, init?: EndpointRequestInit_1): Promise<void> { return client_1.call("SubTypesEndpoint", "receiveEvent", { event }, init); }
diff --git a/packages/ts/lit-form/package.json b/packages/ts/lit-form/package.json
index c34d61c8c8..1301f4b3e9 100644
--- a/packages/ts/lit-form/package.json
+++ b/packages/ts/lit-form/package.json
@@ -71,7 +71,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-core": "24.4.0-alpha3",
+    "@vaadin/hilla-frontend": "24.4.0-alpha3",
     "validator": "^13.11.0"
   },
   "peerDependencies": {
diff --git a/packages/ts/lit-form/src/BinderRoot.ts b/packages/ts/lit-form/src/BinderRoot.ts
index 0e1ce91f34..063c440260 100644
--- a/packages/ts/lit-form/src/BinderRoot.ts
+++ b/packages/ts/lit-form/src/BinderRoot.ts
@@ -1,4 +1,4 @@
-import { EndpointValidationError, type ValidationErrorData } from '@vaadin/hilla-core/EndpointErrors.js';
+import { EndpointValidationError, type ValidationErrorData } from '@vaadin/hilla-frontend/EndpointErrors.js';
 import {
   _clearValidation,
   _setErrorsWithDescendants,
diff --git a/packages/ts/lit-form/test/Validation.test.ts b/packages/ts/lit-form/test/Validation.test.ts
index 761c5b9bc8..0888b089f3 100644
--- a/packages/ts/lit-form/test/Validation.test.ts
+++ b/packages/ts/lit-form/test/Validation.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-unused-expressions, no-shadow */
 import { assert, expect, use } from '@esm-bundle/chai';
-import { EndpointValidationError, ValidationErrorData } from '@vaadin/hilla-core';
+import { EndpointValidationError, ValidationErrorData } from '@vaadin/hilla-frontend';
 import chaiDom from 'chai-dom';
 import { css, html, LitElement } from 'lit';
 import { customElement, query } from 'lit/decorators.js';
diff --git a/packages/ts/react-auth/package.json b/packages/ts/react-auth/package.json
index b0e5c81390..54cfffa75a 100644
--- a/packages/ts/react-auth/package.json
+++ b/packages/ts/react-auth/package.json
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-core": "24.4.0-alpha3"
+    "@vaadin/hilla-frontend": "24.4.0-alpha3"
   },
   "peerDependencies": {
     "react": "^18",
diff --git a/packages/ts/react-auth/src/useAuth.tsx b/packages/ts/react-auth/src/useAuth.tsx
index 1865c7af10..131b162acd 100644
--- a/packages/ts/react-auth/src/useAuth.tsx
+++ b/packages/ts/react-auth/src/useAuth.tsx
@@ -1,4 +1,4 @@
-import { login as _login, type LoginResult, logout as _logout } from '@vaadin/hilla-core';
+import { login as _login, type LoginResult, logout as _logout } from '@vaadin/hilla-frontend';
 import { createContext, type Dispatch, useContext, useEffect, useReducer } from 'react';
 
 type LoginFunction = (username: string, password: string) => Promise<LoginResult>;
diff --git a/packages/ts/react-crud/package.json b/packages/ts/react-crud/package.json
index 94b4b10ea0..8b730f0fff 100644
--- a/packages/ts/react-crud/package.json
+++ b/packages/ts/react-crud/package.json
@@ -56,7 +56,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-core": "24.4.0-alpha3",
+    "@vaadin/hilla-frontend": "24.4.0-alpha3",
     "@vaadin/hilla-lit-form": "24.4.0-alpha3",
     "@vaadin/hilla-react-form": "24.4.0-alpha3",
     "@vaadin/react-components": "24.4.0-alpha10"
diff --git a/packages/ts/react-crud/src/autoform.tsx b/packages/ts/react-crud/src/autoform.tsx
index 80b853a8d3..004cc558d1 100644
--- a/packages/ts/react-crud/src/autoform.tsx
+++ b/packages/ts/react-crud/src/autoform.tsx
@@ -1,4 +1,4 @@
-import { EndpointError } from '@vaadin/hilla-core';
+import { EndpointError } from '@vaadin/hilla-frontend';
 import { type AbstractModel, type DetachedModelConstructor, ValidationError, type Value } from '@vaadin/hilla-lit-form';
 import { useForm, type UseFormResult } from '@vaadin/hilla-react-form';
 import { Button } from '@vaadin/react-components/Button.js';
diff --git a/packages/ts/react-crud/test/autoform.spec.tsx b/packages/ts/react-crud/test/autoform.spec.tsx
index aded090933..1f26ece980 100644
--- a/packages/ts/react-crud/test/autoform.spec.tsx
+++ b/packages/ts/react-crud/test/autoform.spec.tsx
@@ -4,7 +4,7 @@
 import { expect, use } from '@esm-bundle/chai';
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { EndpointError } from '@vaadin/hilla-core';
+import { EndpointError } from '@vaadin/hilla-frontend';
 import { ValidationError } from '@vaadin/hilla-lit-form';
 import type { ValueError } from '@vaadin/hilla-lit-form/Validation.js';
 import type { SelectElement } from '@vaadin/react-components/Select.js';