From ce23ea6ec1f7edc1782e84d4f96ea21b3ec9deda Mon Sep 17 00:00:00 2001
From: Anton Platonov <anton@vaadin.com>
Date: Mon, 10 Jan 2022 14:10:52 +0200
Subject: [PATCH] Revert "refactor!: rename Fusion to Hilla (#995)" (#996)

This reverts commit 42b2cd09713f319b3b2ce848829ab51e64427a45.
---
 pom.xml                                       |   1 -
 vaadin-spring-tests/pom.xml                   |  11 ++++--
 .../frontend/index.html                       |  23 ------------
 .../frontend/index.html                       |  23 ------------
 .../test-spring-boot-scan/frontend/index.html |  23 ------------
 .../test-spring-boot/frontend/index.html      |  23 ------------
 .../frontend/index.html                       |  23 ------------
 .../frontend/index.html                       |  23 ------------
 .../.gitignore                                |   2 +-
 .../pom.xml                                   |  16 ++++-----
 .../endpoints/BalanceEndpoint.java            |  11 +++---
 .../endpoints/ElementsEndpoint.java           |   8 ++---
 .../endpoints/PublicEndpoint.java             |   4 +--
 .../endpoints/SessionEndpoint.java            |   4 +--
 .../endpoints/UserInfoEndpoint.java           |   8 ++---
 .../Application.java                          |   4 +--
 .../src/main/resources/application.properties |   0
 .../SecurityIT.java                           |   4 +--
 .../.gitignore                                |   2 +-
 .../pom.xml                                   |  16 ++++-----
 .../fusionsecurityjwt}/Application.java       |   8 ++---
 .../fusionsecurityjwt}/JwtSecurityUtils.java  |   4 +--
 .../endpoints/BalanceEndpoint.java            |   6 ++--
 .../endpoints/ElementsEndpoint.java           |   8 ++---
 .../endpoints/PublicEndpoint.java             |   4 +--
 .../endpoints/SessionEndpoint.java            |   4 +--
 .../endpoints/UserInfoEndpoint.java           |   8 ++---
 .../src/main/resources/application.properties |   0
 .../spring/fusionsecurityjwt}/SecurityIT.java |   4 +--
 .../frontend/auth.ts                          |   0
 .../frontend/connect-client.ts                |   0
 .../frontend/index.html                       |   0
 .../frontend/index.ts                         |   0
 .../frontend/routes.ts                        |   2 +-
 .../frontend/stores/app-store.ts              |   2 +-
 .../spring-security-test-app/styles.css       |   0
 .../frontend/views/admin/admin-view.ts        |   0
 .../frontend/views/login-view.ts              |   2 +-
 .../frontend/views/main-view.ts               |   2 +-
 .../frontend/views/private/private-view.ts    |   0
 .../frontend/views/public/public-view.ts      |   0
 .../views/public/vaadin-elements-view.ts      |   2 +-
 .../frontend/views/view.ts                    |   0
 .../pom.xml                                   |   8 ++---
 .../spring/fusionsecurity}/Application.java   |   2 +-
 .../spring/fusionsecurity}/Configurator.java  |   2 +-
 .../spring/fusionsecurity}/DataGenerator.java |  10 +++---
 .../fusionsecurity}/SecurityConfig.java       |   6 ++--
 .../spring/fusionsecurity}/SecurityUtils.java |   6 ++--
 .../spring/fusionsecurity}/data/Account.java  |   2 +-
 .../data/AccountRepository.java               |   2 +-
 .../spring/fusionsecurity}/data/UserInfo.java |   2 +-
 .../data/UserInfoRepository.java              |   2 +-
 .../endpoints/BalanceEndpoint.java            |  11 +++---
 .../endpoints/ElementsEndpoint.java           |   8 ++---
 .../endpoints/PublicEndpoint.java             |   4 +--
 .../endpoints/SessionEndpoint.java            |   4 +--
 .../endpoints/UserInfoEndpoint.java           |   8 ++---
 .../fusionsecurity/fusionform}/Elements.java  |   2 +-
 .../fusionsecurity}/service/BankService.java  |   8 ++---
 .../META-INF/resources/icons/icon.png         | Bin
 .../src/main/resources/application.properties |   0
 .../resources/static/admin-only/secret.txt    |   0
 .../resources/static/all-logged-in/secret.txt |   0
 .../src/main/resources/static/icons/icon.png  | Bin
 .../resources/static/public/images/bank.jpg   | Bin
 .../resources/static/public/images/logo.jpg   | Bin
 .../static/public/profiles/admin.svg          |   0
 .../resources/static/public/profiles/user.svg |   0
 .../main/resources/static/public/public.txt   |   0
 .../flow/spring/fusionform/FusionFormIT.java} |   4 +--
 .../flow/spring/fusionsecurity}/MenuItem.java |   2 +-
 .../spring/fusionsecurity}/SecurityIT.java    |   8 ++---
 .../test-spring-security-fusion/tsconfig.json |  34 ++++++++++++++++++
 .../test-spring-war/frontend/index.html       |  23 ------------
 .../test-spring/frontend/index.html           |  23 ------------
 .../test-ts-services-custom-client/pom.xml    |   6 ++--
 .../com/vaadin/flow/connect/AppEndpoint.java  |   2 +-
 .../test-ts-services/frontend/index.html      |  23 ------------
 vaadin-spring-tests/test-ts-services/pom.xml  |   6 ++--
 .../com/vaadin/flow/connect/AppEndpoint.java  |   2 +-
 .../flow/connect/PackagePrivateEndpoint.java  |   2 +-
 vaadin-spring/pom.xml                         |   4 +--
 .../SpringSecurityAutoConfiguration.java      |   2 +-
 .../VaadinServletContextInitializer.java      |   2 +-
 .../flow/spring/security/RequestUtil.java     |   6 ++--
 ...uestAwareAuthenticationSuccessHandler.java |   2 +-
 .../VaadinWebSecurityConfigurerAdapter.java   |  22 ++++++------
 ...evModeBrowserLauncherNoPropertiesTest.java |   8 ++---
 .../flow/spring/security/RequestUtilTest.java |   8 ++---
 .../VaadinDefaultRequestCacheTest.java        |  12 +++----
 91 files changed, 202 insertions(+), 371 deletions(-)
 delete mode 100644 vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring-boot-scan/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring-boot/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring-security-flow/frontend/index.html
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath => test-spring-security-fusion-contextpath}/.gitignore (83%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath => test-spring-security-fusion-contextpath}/pom.xml (93%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/BalanceEndpoint.java (72%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/ElementsEndpoint.java (69%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/PublicEndpoint.java (72%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/SessionEndpoint.java (83%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/UserInfoEndpoint.java (62%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecuritycontextpath => test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecuritycontextpath}/Application.java (69%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath => test-spring-security-fusion-contextpath}/src/main/resources/application.properties (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/test/java/com/vaadin/flow/spring/hillasecuritycontextpath => test-spring-security-fusion-contextpath/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath}/SecurityIT.java (51%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt => test-spring-security-fusion-jwt}/.gitignore (83%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt => test-spring-security-fusion-jwt}/pom.xml (93%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/Application.java (68%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/JwtSecurityUtils.java (88%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/endpoints/BalanceEndpoint.java (71%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/endpoints/ElementsEndpoint.java (68%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/endpoints/PublicEndpoint.java (71%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/endpoints/SessionEndpoint.java (82%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt}/endpoints/UserInfoEndpoint.java (59%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt => test-spring-security-fusion-jwt}/src/main/resources/application.properties (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla-jwt/src/test/java/com/vaadin/flow/spring/hillasecurityjwt => test-spring-security-fusion-jwt/src/test/java/com/vaadin/flow/spring/fusionsecurityjwt}/SecurityIT.java (96%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/auth.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/connect-client.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/index.html (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/index.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/routes.ts (98%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/stores/app-store.ts (97%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/themes/spring-security-test-app/styles.css (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/admin/admin-view.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/login-view.ts (93%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/main-view.ts (99%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/private/private-view.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/public/public-view.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/public/vaadin-elements-view.ts (99%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/frontend/views/view.ts (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/pom.xml (97%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/Application.java (90%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/Configurator.java (86%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/DataGenerator.java (86%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/SecurityConfig.java (95%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/SecurityUtils.java (89%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/data/Account.java (93%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/data/AccountRepository.java (86%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/data/UserInfo.java (97%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/data/UserInfoRepository.java (79%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/BalanceEndpoint.java (72%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/ElementsEndpoint.java (69%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/PublicEndpoint.java (72%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/SessionEndpoint.java (83%)
 rename vaadin-spring-tests/{test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/endpoints/UserInfoEndpoint.java (62%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/hillaform => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/fusionform}/Elements.java (96%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity}/service/BankService.java (79%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/META-INF/resources/icons/icon.png (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/application.properties (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/admin-only/secret.txt (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/all-logged-in/secret.txt (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/icons/icon.png (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/public/images/bank.jpg (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/public/images/logo.jpg (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/public/profiles/admin.svg (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/public/profiles/user.svg (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla => test-spring-security-fusion}/src/main/resources/static/public/public.txt (100%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillaform/HillaFormIT.java => test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionform/FusionFormIT.java} (97%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity}/MenuItem.java (97%)
 rename vaadin-spring-tests/{test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity => test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity}/SecurityIT.java (98%)
 create mode 100644 vaadin-spring-tests/test-spring-security-fusion/tsconfig.json
 delete mode 100644 vaadin-spring-tests/test-spring-war/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-spring/frontend/index.html
 delete mode 100644 vaadin-spring-tests/test-ts-services/frontend/index.html

diff --git a/pom.xml b/pom.xml
index 826cc51fb..8873c14bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
 
         <!-- These are typically overridden with BOMs -->
         <vaadin.flow.version>10.0-SNAPSHOT</vaadin.flow.version>
-        <hilla.version>1.0-SNAPSHOT</hilla.version>
         <spring-boot.version>2.6.2</spring-boot.version>
 
         <!-- Additional manifest fields -->
diff --git a/vaadin-spring-tests/pom.xml b/vaadin-spring-tests/pom.xml
index 49af31ab7..3d1c3fde4 100644
--- a/vaadin-spring-tests/pom.xml
+++ b/vaadin-spring-tests/pom.xml
@@ -62,6 +62,11 @@
                 <artifactId>vaadin-dialog-flow</artifactId>
                 <version>${vaadin.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-notification-flow</artifactId>
+                <version>${vaadin.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-ordered-layout-flow</artifactId>
@@ -257,9 +262,9 @@
 
         <module>test-spring-security-flow</module>
         <module>test-spring-security-flow-contextpath</module>
-        <module>test-spring-security-hilla</module>
-        <module>test-spring-security-hilla-jwt</module>
-        <module>test-spring-security-hilla-contextpath</module>
+        <module>test-spring-security-fusion</module>
+        <module>test-spring-security-fusion-jwt</module>
+        <module>test-spring-security-fusion-contextpath</module>
 
         <!-- nexus-staging-maven-plugin requires the last module to be not skipped for deployment -->
         <module>dummy-module</module>
diff --git a/vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html b/vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html b/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-boot-scan/frontend/index.html b/vaadin-spring-tests/test-spring-boot-scan/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-boot-scan/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-boot/frontend/index.html b/vaadin-spring-tests/test-spring-boot/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-boot/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html b/vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-security-flow/frontend/index.html b/vaadin-spring-tests/test-spring-security-flow/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-security-flow/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/.gitignore b/vaadin-spring-tests/test-spring-security-fusion-contextpath/.gitignore
similarity index 83%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/.gitignore
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/.gitignore
index 4766f64b5..cf26aade1 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/.gitignore
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
+# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
 frontend/
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/pom.xml b/vaadin-spring-tests/test-spring-security-fusion-contextpath/pom.xml
similarity index 93%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/pom.xml
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/pom.xml
index a2f1c0836..9ddb3a0b7 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/pom.xml
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-hilla-contextpath</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Hilla With Context Path</name>
+    <artifactId>test-spring-security-fusion-contextpath</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Fusion With Context Path</name>
     <packaging>jar</packaging>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -21,8 +21,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,18 +46,18 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <classifier>frontend</classifier>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -113,7 +113,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>com.vaadin</groupId>
-                                    <artifactId>test-spring-security-hilla</artifactId>
+                                    <artifactId>test-spring-security-fusion</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>frontend</classifier>
                                     <outputDirectory>${project.basedir}/frontend</outputDirectory>
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
similarity index 72%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
index 6f8d43351..45d6ae810 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
@@ -1,14 +1,13 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
-
-import java.math.BigDecimal;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import javax.annotation.security.PermitAll;
-
-import dev.hilla.Endpoint;
-import com.vaadin.flow.spring.hillasecurity.service.BankService;
+import java.math.BigDecimal;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vaadin.flow.spring.fusionsecurity.service.BankService;
+import com.vaadin.fusion.Endpoint;
+
 @Endpoint
 @PermitAll
 public class BalanceEndpoint {
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/ElementsEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
similarity index 69%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/ElementsEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
index 038cc2f1d..c9434e499 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/ElementsEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
@@ -1,12 +1,12 @@
-package com.vaadin.flow.spring.hillasecurityjwt.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import dev.hilla.Endpoint;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements.Options;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements.Options;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/PublicEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
similarity index 72%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/PublicEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
index 6a9eadb2e..fd6829ca0 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/PublicEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
@@ -1,8 +1,8 @@
-package com.vaadin.flow.spring.hillasecurityjwt.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import java.time.LocalDateTime;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/SessionEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
similarity index 83%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/SessionEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
index 830d278f5..004bf3650 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/SessionEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
@@ -1,9 +1,9 @@
-package com.vaadin.flow.spring.hillasecurityjwt.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import com.vaadin.flow.server.VaadinRequest;
 import com.vaadin.flow.server.WrappedSession;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 
 @Endpoint
 @AnonymousAllowed
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
similarity index 62%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
index 9e5c916b4..38e89789b 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import javax.annotation.Nullable;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.flow.spring.hillasecurity.SecurityUtils;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.SecurityUtils;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecuritycontextpath/Application.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecuritycontextpath/Application.java
similarity index 69%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecuritycontextpath/Application.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecuritycontextpath/Application.java
index 24b899e31..3c5716f8f 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecuritycontextpath/Application.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/java/com/vaadin/flow/spring/fusionsecuritycontextpath/Application.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecuritycontextpath;
+package com.vaadin.flow.spring.fusionsecuritycontextpath;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class Application
-        extends com.vaadin.flow.spring.hillasecurity.Application {
+        extends com.vaadin.flow.spring.fusionsecurity.Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/resources/application.properties b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/resources/application.properties
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/resources/application.properties
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/main/resources/application.properties
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/test/java/com/vaadin/flow/spring/hillasecuritycontextpath/SecurityIT.java b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath/SecurityIT.java
similarity index 51%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/test/java/com/vaadin/flow/spring/hillasecuritycontextpath/SecurityIT.java
rename to vaadin-spring-tests/test-spring-security-fusion-contextpath/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath/SecurityIT.java
index f992b6f56..d3747a70c 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/test/java/com/vaadin/flow/spring/hillasecuritycontextpath/SecurityIT.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-contextpath/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath/SecurityIT.java
@@ -1,7 +1,7 @@
-package com.vaadin.flow.spring.hillasecuritycontextpath;
+package com.vaadin.flow.spring.fusionsecuritycontextpath;
 
 public class SecurityIT
-        extends com.vaadin.flow.spring.hillasecurity.SecurityIT {
+        extends com.vaadin.flow.spring.fusionsecurity.SecurityIT {
 
     @Override
     protected String getRootURL() {
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/.gitignore b/vaadin-spring-tests/test-spring-security-fusion-jwt/.gitignore
similarity index 83%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/.gitignore
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/.gitignore
index 4766f64b5..cf26aade1 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/.gitignore
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
+# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
 frontend/
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/pom.xml b/vaadin-spring-tests/test-spring-security-fusion-jwt/pom.xml
similarity index 93%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/pom.xml
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/pom.xml
index 5c2df6583..62538fac2 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/pom.xml
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-hilla-jwt</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Hilla With JWT</name>
+    <artifactId>test-spring-security-fusion-jwt</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Fusion With JWT</name>
     <packaging>jar</packaging>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -21,8 +21,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,18 +38,18 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <classifier>frontend</classifier>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -116,7 +116,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>com.vaadin</groupId>
-                                    <artifactId>test-spring-security-hilla</artifactId>
+                                    <artifactId>test-spring-security-fusion</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>frontend</classifier>
                                     <outputDirectory>${project.basedir}/frontend</outputDirectory>
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/Application.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/Application.java
similarity index 68%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/Application.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/Application.java
index b4c11ee42..848a677d4 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/Application.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/Application.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurityjwt;
+package com.vaadin.flow.spring.fusionsecurityjwt;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,11 +8,11 @@
 
 @SpringBootApplication()
 @ComponentScan(basePackages = {
-        "com.vaadin.flow.spring.hillasecurity" }, excludeFilters = {
-                @ComponentScan.Filter(type = FilterType.REGEX, pattern = "com\\.vaadin\\.flow\\.spring\\.hillasecurity\\.endpoints\\..*") })
+        "com.vaadin.flow.spring.fusionsecurity" }, excludeFilters = {
+                @ComponentScan.Filter(type = FilterType.REGEX, pattern = "com\\.vaadin\\.flow\\.spring\\.fusionsecurity\\.endpoints\\..*") })
 @Import(JwtSecurityUtils.class)
 public class Application
-        extends com.vaadin.flow.spring.hillasecurity.Application {
+        extends com.vaadin.flow.spring.fusionsecurity.Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/JwtSecurityUtils.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/JwtSecurityUtils.java
similarity index 88%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/JwtSecurityUtils.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/JwtSecurityUtils.java
index d36758b9b..9fd54de8a 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/JwtSecurityUtils.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/JwtSecurityUtils.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurityjwt;
+package com.vaadin.flow.spring.fusionsecurityjwt;
 
 import java.util.Collections;
 
@@ -13,7 +13,7 @@
 @Component
 @Primary
 public class JwtSecurityUtils
-        extends com.vaadin.flow.spring.hillasecurity.SecurityUtils {
+        extends com.vaadin.flow.spring.fusionsecurity.SecurityUtils {
 
     public UserDetails getAuthenticatedUser() {
         SecurityContext context = SecurityContextHolder.getContext();
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/BalanceEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/BalanceEndpoint.java
similarity index 71%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/BalanceEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/BalanceEndpoint.java
index d2f1a008a..263aed688 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/BalanceEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/BalanceEndpoint.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecurityjwt.endpoints;
+package com.vaadin.flow.spring.fusionsecurityjwt.endpoints;
 
 import java.math.BigDecimal;
 
 import javax.annotation.security.PermitAll;
 
-import dev.hilla.Endpoint;
-import com.vaadin.flow.spring.hillasecurity.service.BankService;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.flow.spring.fusionsecurity.service.BankService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/ElementsEndpoint.java
similarity index 68%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/ElementsEndpoint.java
index 03880a3e1..92e3631b0 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/ElementsEndpoint.java
@@ -1,12 +1,12 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurityjwt.endpoints;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import dev.hilla.Endpoint;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements.Options;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements.Options;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/PublicEndpoint.java
similarity index 71%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/PublicEndpoint.java
index 7b1df6da9..ab7c9a7a0 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/PublicEndpoint.java
@@ -1,8 +1,8 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurityjwt.endpoints;
 
 import java.time.LocalDateTime;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/SessionEndpoint.java
similarity index 82%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/SessionEndpoint.java
index 238aefd1b..f3e6aac40 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/SessionEndpoint.java
@@ -1,9 +1,9 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurityjwt.endpoints;
 
 import com.vaadin.flow.server.VaadinRequest;
 import com.vaadin.flow.server.WrappedSession;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 
 @Endpoint
 @AnonymousAllowed
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/UserInfoEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/UserInfoEndpoint.java
similarity index 59%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/UserInfoEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/UserInfoEndpoint.java
index edaa5af69..f2c4d0952 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/java/com/vaadin/flow/spring/hillasecurityjwt/endpoints/UserInfoEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/java/com/vaadin/flow/spring/fusionsecurityjwt/endpoints/UserInfoEndpoint.java
@@ -1,9 +1,9 @@
-package com.vaadin.flow.spring.hillasecurityjwt.endpoints;
+package com.vaadin.flow.spring.fusionsecurityjwt.endpoints;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.flow.spring.hillasecurity.SecurityUtils;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.SecurityUtils;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/resources/application.properties b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/resources/application.properties
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/main/resources/application.properties
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/main/resources/application.properties
diff --git a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/test/java/com/vaadin/flow/spring/hillasecurityjwt/SecurityIT.java b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/test/java/com/vaadin/flow/spring/fusionsecurityjwt/SecurityIT.java
similarity index 96%
rename from vaadin-spring-tests/test-spring-security-hilla-jwt/src/test/java/com/vaadin/flow/spring/hillasecurityjwt/SecurityIT.java
rename to vaadin-spring-tests/test-spring-security-fusion-jwt/src/test/java/com/vaadin/flow/spring/fusionsecurityjwt/SecurityIT.java
index b6b32305c..125d19512 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-jwt/src/test/java/com/vaadin/flow/spring/hillasecurityjwt/SecurityIT.java
+++ b/vaadin-spring-tests/test-spring-security-fusion-jwt/src/test/java/com/vaadin/flow/spring/fusionsecurityjwt/SecurityIT.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurityjwt;
+package com.vaadin.flow.spring.fusionsecurityjwt;
 
 import java.util.Base64;
 
@@ -10,7 +10,7 @@
 import elemental.json.JsonObject;
 
 public class SecurityIT
-        extends com.vaadin.flow.spring.hillasecurity.SecurityIT {
+        extends com.vaadin.flow.spring.fusionsecurity.SecurityIT {
 
     @Test
     public void jwt_cookie_set_for_user() {
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/auth.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/auth.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/auth.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/auth.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/connect-client.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/connect-client.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/connect-client.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/connect-client.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/index.html b/vaadin-spring-tests/test-spring-security-fusion/frontend/index.html
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/index.html
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/index.html
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/index.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/index.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/index.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/index.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/routes.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/routes.ts
similarity index 98%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/routes.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/routes.ts
index 39852ff22..ba8826c74 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/frontend/routes.ts
+++ b/vaadin-spring-tests/test-spring-security-fusion/frontend/routes.ts
@@ -20,7 +20,7 @@ export const views: ViewRoute[] = [
     path: "form",
     component: "vaadin-elements-view",
     name: "form",
-    title: "Hilla Form",
+    title: "Fusion Form",
     action: async () => {
       await import("./views/public/vaadin-elements-view");
     },
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/stores/app-store.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/stores/app-store.ts
similarity index 97%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/stores/app-store.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/stores/app-store.ts
index 2a8d1223b..6cf1bcc0f 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/frontend/stores/app-store.ts
+++ b/vaadin-spring-tests/test-spring-security-fusion/frontend/stores/app-store.ts
@@ -1,5 +1,5 @@
 import { RouterLocation } from "@vaadin/router";
-import UserInfo from "Frontend/generated/com/vaadin/flow/spring/hillasecurity/data/UserInfo";
+import UserInfo from "Frontend/generated/com/vaadin/flow/spring/fusionsecurity/data/UserInfo";
 import { UserInfoEndpoint } from "Frontend/generated/endpoints";
 import { makeAutoObservable } from "mobx";
 export class AppStore {
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/themes/spring-security-test-app/styles.css b/vaadin-spring-tests/test-spring-security-fusion/frontend/themes/spring-security-test-app/styles.css
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/themes/spring-security-test-app/styles.css
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/themes/spring-security-test-app/styles.css
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/admin/admin-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/admin/admin-view.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/admin/admin-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/admin/admin-view.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/login-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/login-view.ts
similarity index 93%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/login-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/login-view.ts
index bd9f2dbf6..6971bea13 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/login-view.ts
+++ b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/login-view.ts
@@ -21,7 +21,7 @@ export class LoginView extends View implements AfterEnterObserver {
 
     // If login was opened directly, use the default URL provided by the server.
 
-    // As we do not know if the target is a resource or a Hilla view or a Flow view, we cannot just use Router.go
+    // As we do not know if the target is a resource or a Fusion view or a Flow view, we cannot just use Router.go
     window.location.href =
       result.redirectUrl || this.returnUrl || '';
   };
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/main-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/main-view.ts
similarity index 99%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/main-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/main-view.ts
index 3ecde2170..6020d8dda 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/main-view.ts
+++ b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/main-view.ts
@@ -88,7 +88,7 @@ export class MainView extends Layout {
       },
       {
         path: "form",
-        title: "Hilla Form",
+        title: "Fusion Form",
       },
       {
         path: "private",
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/private/private-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/private/private-view.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/private/private-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/private/private-view.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/public/public-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/public/public-view.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/public/public-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/public/public-view.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/public/vaadin-elements-view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/public/vaadin-elements-view.ts
similarity index 99%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/public/vaadin-elements-view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/public/vaadin-elements-view.ts
index e93d0ded8..9b1d7c2b6 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/public/vaadin-elements-view.ts
+++ b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/public/vaadin-elements-view.ts
@@ -28,7 +28,7 @@ import '@vaadin/notification';
 import { field, Binder } from '@vaadin/form';
 
 import { View } from '../view';
-import ElementsModel from 'Frontend/generated/com/vaadin/flow/spring/hillasecurity/hillaform/ElementsModel';
+import ElementsModel from 'Frontend/generated/com/vaadin/flow/spring/fusionsecurity/fusionform/ElementsModel';
 import { ElementsEndpoint } from 'Frontend/generated/endpoints';
 
 @customElement('vaadin-elements-view')
diff --git a/vaadin-spring-tests/test-spring-security-hilla/frontend/views/view.ts b/vaadin-spring-tests/test-spring-security-fusion/frontend/views/view.ts
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/frontend/views/view.ts
rename to vaadin-spring-tests/test-spring-security-fusion/frontend/views/view.ts
diff --git a/vaadin-spring-tests/test-spring-security-hilla/pom.xml b/vaadin-spring-tests/test-spring-security-fusion/pom.xml
similarity index 97%
rename from vaadin-spring-tests/test-spring-security-hilla/pom.xml
rename to vaadin-spring-tests/test-spring-security-fusion/pom.xml
index eb0d7f9b3..db8013a3e 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/pom.xml
+++ b/vaadin-spring-tests/test-spring-security-fusion/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-hilla</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Hilla</name>
+    <artifactId>test-spring-security-fusion</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Fusion</name>
     <packaging>jar</packaging>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -21,8 +21,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Application.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Application.java
similarity index 90%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Application.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Application.java
index 78d4e9f72..7ffc1d4e0 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Application.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Application.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import com.vaadin.flow.component.dependency.NpmPackage;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Configurator.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Configurator.java
similarity index 86%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Configurator.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Configurator.java
index 6e50174d0..086ab3e48 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/Configurator.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/Configurator.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.server.PWA;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/DataGenerator.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/DataGenerator.java
similarity index 86%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/DataGenerator.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/DataGenerator.java
index ec7e441b5..e07145129 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/DataGenerator.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/DataGenerator.java
@@ -1,12 +1,12 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import java.math.BigDecimal;
 
 import com.vaadin.flow.spring.annotation.SpringComponent;
-import com.vaadin.flow.spring.hillasecurity.data.Account;
-import com.vaadin.flow.spring.hillasecurity.data.AccountRepository;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfoRepository;
+import com.vaadin.flow.spring.fusionsecurity.data.Account;
+import com.vaadin.flow.spring.fusionsecurity.data.AccountRepository;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfoRepository;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityConfig.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityConfig.java
similarity index 95%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityConfig.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityConfig.java
index f9226073e..f9b24eb3f 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityConfig.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import javax.crypto.spec.SecretKeySpec;
 import java.util.Base64;
@@ -19,8 +19,8 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.jose.jws.JwsAlgorithms;
 
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfoRepository;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfoRepository;
 import com.vaadin.flow.spring.security.VaadinWebSecurityConfigurerAdapter;
 
 @EnableWebSecurity
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityUtils.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityUtils.java
similarity index 89%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityUtils.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityUtils.java
index 82d06325a..17ed512a2 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/SecurityUtils.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/SecurityUtils.java
@@ -1,8 +1,8 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import com.vaadin.flow.server.VaadinServletRequest;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfoRepository;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfoRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.context.SecurityContext;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/Account.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/Account.java
similarity index 93%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/Account.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/Account.java
index 069628485..947388a24 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/Account.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/Account.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity.data;
+package com.vaadin.flow.spring.fusionsecurity.data;
 
 import java.math.BigDecimal;
 import java.util.UUID;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/AccountRepository.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/AccountRepository.java
similarity index 86%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/AccountRepository.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/AccountRepository.java
index db0c5a5ea..0b6218a1f 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/AccountRepository.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/AccountRepository.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity.data;
+package com.vaadin.flow.spring.fusionsecurity.data;
 
 import java.util.Optional;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfo.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfo.java
similarity index 97%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfo.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfo.java
index e784dec06..5dbbee36b 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfo.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfo.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity.data;
+package com.vaadin.flow.spring.fusionsecurity.data;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfoRepository.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfoRepository.java
similarity index 79%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfoRepository.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfoRepository.java
index f12921bef..3a4488fb7 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/data/UserInfoRepository.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/data/UserInfoRepository.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity.data;
+package com.vaadin.flow.spring.fusionsecurity.data;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
similarity index 72%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
index 9dd7ba711..f4e006dc9 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/BalanceEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/BalanceEndpoint.java
@@ -1,12 +1,13 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
-import javax.annotation.security.PermitAll;
 import java.math.BigDecimal;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.security.PermitAll;
 
-import com.vaadin.flow.spring.hillasecurity.service.BankService;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.flow.spring.fusionsecurity.service.BankService;
+
+import org.springframework.beans.factory.annotation.Autowired;
 
 @Endpoint
 @PermitAll
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
similarity index 69%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
index 03880a3e1..c9434e499 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/ElementsEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/ElementsEndpoint.java
@@ -1,12 +1,12 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import dev.hilla.Endpoint;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements;
-import com.vaadin.flow.spring.hillasecurity.hillaform.Elements.Options;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements;
+import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements.Options;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
similarity index 72%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
index 7b1df6da9..fd6829ca0 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/PublicEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/PublicEndpoint.java
@@ -1,8 +1,8 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import java.time.LocalDateTime;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
similarity index 83%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
index 238aefd1b..004bf3650 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/SessionEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/SessionEndpoint.java
@@ -1,9 +1,9 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import com.vaadin.flow.server.VaadinRequest;
 import com.vaadin.flow.server.WrappedSession;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 
 @Endpoint
 @AnonymousAllowed
diff --git a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
similarity index 62%
rename from vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
index 9e5c916b4..38e89789b 100644
--- a/vaadin-spring-tests/test-spring-security-hilla-contextpath/src/main/java/com/vaadin/flow/spring/hillasecurity/endpoints/UserInfoEndpoint.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/endpoints/UserInfoEndpoint.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecurity.endpoints;
+package com.vaadin.flow.spring.fusionsecurity.endpoints;
 
 import javax.annotation.Nullable;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.flow.spring.hillasecurity.SecurityUtils;
-import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
+import com.vaadin.flow.spring.fusionsecurity.SecurityUtils;
+import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/hillaform/Elements.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/fusionform/Elements.java
similarity index 96%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/hillaform/Elements.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/fusionform/Elements.java
index 776280ebe..aeeb8d268 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/hillaform/Elements.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/fusionform/Elements.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity.hillaform;
+package com.vaadin.flow.spring.fusionsecurity.fusionform;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/service/BankService.java b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/service/BankService.java
similarity index 79%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/service/BankService.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/service/BankService.java
index 992f98896..260604500 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/main/java/com/vaadin/flow/spring/hillasecurity/service/BankService.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/main/java/com/vaadin/flow/spring/fusionsecurity/service/BankService.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecurity.service;
+package com.vaadin.flow.spring.fusionsecurity.service;
 
 import java.math.BigDecimal;
 import java.util.Optional;
 
-import com.vaadin.flow.spring.hillasecurity.SecurityUtils;
-import com.vaadin.flow.spring.hillasecurity.data.Account;
-import com.vaadin.flow.spring.hillasecurity.data.AccountRepository;
+import com.vaadin.flow.spring.fusionsecurity.SecurityUtils;
+import com.vaadin.flow.spring.fusionsecurity.data.Account;
+import com.vaadin.flow.spring.fusionsecurity.data.AccountRepository;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/META-INF/resources/icons/icon.png b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/META-INF/resources/icons/icon.png
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/META-INF/resources/icons/icon.png
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/META-INF/resources/icons/icon.png
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/application.properties b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/application.properties
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/application.properties
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/application.properties
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/admin-only/secret.txt b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/admin-only/secret.txt
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/admin-only/secret.txt
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/admin-only/secret.txt
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/all-logged-in/secret.txt b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/all-logged-in/secret.txt
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/all-logged-in/secret.txt
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/all-logged-in/secret.txt
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/icons/icon.png b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/icons/icon.png
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/icons/icon.png
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/icons/icon.png
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/images/bank.jpg b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/images/bank.jpg
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/images/bank.jpg
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/images/bank.jpg
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/images/logo.jpg b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/images/logo.jpg
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/images/logo.jpg
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/images/logo.jpg
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/profiles/admin.svg b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/profiles/admin.svg
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/profiles/admin.svg
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/profiles/admin.svg
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/profiles/user.svg b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/profiles/user.svg
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/profiles/user.svg
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/profiles/user.svg
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/public.txt b/vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/public.txt
similarity index 100%
rename from vaadin-spring-tests/test-spring-security-hilla/src/main/resources/static/public/public.txt
rename to vaadin-spring-tests/test-spring-security-fusion/src/main/resources/static/public/public.txt
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillaform/HillaFormIT.java b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionform/FusionFormIT.java
similarity index 97%
rename from vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillaform/HillaFormIT.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionform/FusionFormIT.java
index d091f346f..55722c90f 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillaform/HillaFormIT.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionform/FusionFormIT.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillaform;
+package com.vaadin.flow.spring.fusionform;
 
 import com.vaadin.flow.component.button.testbench.ButtonElement;
 import com.vaadin.flow.component.notification.testbench.NotificationElement;
@@ -10,7 +10,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class HillaFormIT extends ChromeBrowserTest {
+public class FusionFormIT extends ChromeBrowserTest {
 
     private static final int SERVER_PORT = 9999;
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/MenuItem.java b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/MenuItem.java
similarity index 97%
rename from vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/MenuItem.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/MenuItem.java
index 5cacb8551..d39eb3cdc 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/MenuItem.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/MenuItem.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 public class MenuItem {
 
diff --git a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/SecurityIT.java b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/SecurityIT.java
similarity index 98%
rename from vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/SecurityIT.java
rename to vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/SecurityIT.java
index c6ea3781d..caaf115ba 100644
--- a/vaadin-spring-tests/test-spring-security-hilla/src/test/java/com/vaadin/flow/spring/hillasecurity/SecurityIT.java
+++ b/vaadin-spring-tests/test-spring-security-fusion/src/test/java/com/vaadin/flow/spring/fusionsecurity/SecurityIT.java
@@ -1,4 +1,4 @@
-package com.vaadin.flow.spring.hillasecurity;
+package com.vaadin.flow.spring.fusionsecurity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -78,7 +78,7 @@ public void menu_correct_for_anonymous() {
         List<MenuItem> menuItems = getMenuItems();
         List<MenuItem> expectedItems = new ArrayList<MenuItem>();
         expectedItems.add(new MenuItem("", "Public", true));
-        expectedItems.add(new MenuItem("form", "Hilla Form", true));
+        expectedItems.add(new MenuItem("form", "Fusion Form", true));
         expectedItems.add(new MenuItem("private", "Private", false));
         expectedItems.add(new MenuItem("admin", "Admin", false));
         Assert.assertEquals(expectedItems, menuItems);
@@ -91,7 +91,7 @@ public void menu_correct_for_user() {
         List<MenuItem> menuItems = getMenuItems();
         List<MenuItem> expectedItems = new ArrayList<MenuItem>();
         expectedItems.add(new MenuItem("", "Public", true));
-        expectedItems.add(new MenuItem("form", "Hilla Form", true));
+        expectedItems.add(new MenuItem("form", "Fusion Form", true));
         expectedItems.add(new MenuItem("private", "Private", true));
         expectedItems.add(new MenuItem("admin", "Admin", false));
         Assert.assertEquals(expectedItems, menuItems);
@@ -104,7 +104,7 @@ public void menu_correct_for_admin() {
         List<MenuItem> menuItems = getMenuItems();
         List<MenuItem> expectedItems = new ArrayList<MenuItem>();
         expectedItems.add(new MenuItem("", "Public", true));
-        expectedItems.add(new MenuItem("form", "Hilla Form", true));
+        expectedItems.add(new MenuItem("form", "Fusion Form", true));
         expectedItems.add(new MenuItem("private", "Private", true));
         expectedItems.add(new MenuItem("admin", "Admin", true));
         Assert.assertEquals(expectedItems, menuItems);
diff --git a/vaadin-spring-tests/test-spring-security-fusion/tsconfig.json b/vaadin-spring-tests/test-spring-security-fusion/tsconfig.json
new file mode 100644
index 000000000..a1c460c87
--- /dev/null
+++ b/vaadin-spring-tests/test-spring-security-fusion/tsconfig.json
@@ -0,0 +1,34 @@
+// This TypeScript configuration file is generated by vaadin-maven-plugin.
+// This is needed for TypeScript compiler to compile your TypeScript code in the project.
+// It is recommended to commit this file to the VCS.
+// You might want to change the configurations to fit your preferences
+// For more information about the configurations, please refer to http://www.typescriptlang.org/docs/handbook/tsconfig-json.html
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "inlineSources": true,
+    "module": "esNext",
+    "target": "es2018",
+    "moduleResolution": "node",
+    "strict": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "experimentalDecorators": true,
+    "baseUrl": "frontend",
+    "paths": {
+      "Frontend/*": [
+        "*"
+      ]
+    }
+  },
+  "include": [
+    "frontend/**/*.ts",
+    "frontend/index.js",
+    "types.d.ts"
+  ],
+  "exclude": []
+}
diff --git a/vaadin-spring-tests/test-spring-war/frontend/index.html b/vaadin-spring-tests/test-spring-war/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring-war/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-spring/frontend/index.html b/vaadin-spring-tests/test-spring/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-spring/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-ts-services-custom-client/pom.xml b/vaadin-spring-tests/test-ts-services-custom-client/pom.xml
index 2784e63d6..f64a95fe0 100644
--- a/vaadin-spring-tests/test-ts-services-custom-client/pom.xml
+++ b/vaadin-spring-tests/test-ts-services-custom-client/pom.xml
@@ -34,9 +34,9 @@
         </dependency>
 
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
-            <version>${hilla.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
+            <version>${vaadin.flow.version}</version>
         </dependency>
 
         <dependency>
diff --git a/vaadin-spring-tests/test-ts-services-custom-client/src/main/java/com/vaadin/flow/connect/AppEndpoint.java b/vaadin-spring-tests/test-ts-services-custom-client/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
index 504afa5dc..f6fb0176b 100644
--- a/vaadin-spring-tests/test-ts-services-custom-client/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
+++ b/vaadin-spring-tests/test-ts-services-custom-client/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
@@ -1,6 +1,6 @@
 package com.vaadin.flow.connect;
 
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 /**
diff --git a/vaadin-spring-tests/test-ts-services/frontend/index.html b/vaadin-spring-tests/test-ts-services/frontend/index.html
deleted file mode 100644
index a5cdd4018..000000000
--- a/vaadin-spring-tests/test-ts-services/frontend/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<!--
-This file is auto-generated by Vaadin.
--->
-
-<html lang="en">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <style>
-    body, #outlet {
-      height: 100vh;
-      width: 100%;
-      margin: 0;
-    }
-  </style>
-  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
-</head>
-<body>
-  <!-- This outlet div is where the views are rendered -->
-  <div id="outlet"></div>
-</body>
-</html>
diff --git a/vaadin-spring-tests/test-ts-services/pom.xml b/vaadin-spring-tests/test-ts-services/pom.xml
index 5c0a06db6..41595e6c6 100644
--- a/vaadin-spring-tests/test-ts-services/pom.xml
+++ b/vaadin-spring-tests/test-ts-services/pom.xml
@@ -37,9 +37,9 @@
             <version>${vaadin.flow.version}</version>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
-            <version>${hilla.version}</version>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
+            <version>${vaadin.flow.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/AppEndpoint.java b/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
index 3de71919f..eadfb2400 100644
--- a/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
+++ b/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/AppEndpoint.java
@@ -10,7 +10,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.vaadin.flow.server.VaadinRequest;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 /**
diff --git a/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/PackagePrivateEndpoint.java b/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/PackagePrivateEndpoint.java
index e9da57fee..79c8f6541 100644
--- a/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/PackagePrivateEndpoint.java
+++ b/vaadin-spring-tests/test-ts-services/src/main/java/com/vaadin/flow/connect/PackagePrivateEndpoint.java
@@ -4,7 +4,7 @@
 import javax.annotation.security.PermitAll;
 
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.Endpoint;
+import com.vaadin.fusion.Endpoint;
 
 /**
  * Simple Vaadin Connect Service definition.
diff --git a/vaadin-spring/pom.xml b/vaadin-spring/pom.xml
index 5240cd61f..6f7eef2f3 100644
--- a/vaadin-spring/pom.xml
+++ b/vaadin-spring/pom.xml
@@ -29,8 +29,8 @@
             <artifactId>flow-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java
index e7450e44e..20f767746 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/SpringSecurityAutoConfiguration.java
@@ -75,7 +75,7 @@ public ViewAccessChecker viewAccessChecker() {
      * Makes the default access annotation checker available for security
      * configuration.
      * <p>
-     * Hilla makes this bean available by default but if Hilla is excluded
+     * Fusion makes this bean available by default but if Fusion is excluded
      * from the project, we make it available here
      * 
      * @return the default access annotation checker
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
index 54350d930..3fca6d22e 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
@@ -739,7 +739,7 @@ private List<String> getDefaultPackages() {
     private List<String> getLookupPackages() {
         return Stream
                 .concat(getDefaultPackages().stream(),
-                        Stream.of("dev.hilla.frontend",
+                        Stream.of("com.vaadin.fusion.frontend",
                                 "com.vaadin.flow.component.polymertemplate.rpc",
                                 "com.vaadin.base.devserver"))
                 .collect(Collectors.toList());
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/RequestUtil.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/RequestUtil.java
index c1fc88a6a..52deaa667 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/RequestUtil.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/RequestUtil.java
@@ -13,7 +13,7 @@
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.auth.AccessAnnotationChecker;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import dev.hilla.EndpointUtil;
+import com.vaadin.fusion.EndpointUtil;
 import com.vaadin.flow.spring.SpringServlet;
 import com.vaadin.flow.spring.VaadinConfigurationProperties;
 
@@ -49,9 +49,9 @@ public void init() {
         try {
             endpointUtil = applicationContext.getBean(EndpointUtil.class);
         } catch (NoClassDefFoundError e) {
-            // Presumable Hilla is not on the classpath
+            // Presumable Fusion is not on the classpath
         } catch (Exception e) {
-            // Presumable Hilla is not on the classpath
+            // Presumable Fusion is not on the classpath
         }
 
     }
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinSavedRequestAwareAuthenticationSuccessHandler.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinSavedRequestAwareAuthenticationSuccessHandler.java
index f8f18b839..0504cce67 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinSavedRequestAwareAuthenticationSuccessHandler.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinSavedRequestAwareAuthenticationSuccessHandler.java
@@ -35,7 +35,7 @@
 
 /**
  * A version of {@link SavedRequestAwareAuthenticationSuccessHandler} that
- * writes a different return value for a Hilla TypeScript client.
+ * writes a different return value for a Fusion TypeScript client.
  * <p>
  * This class acts as a {@link SavedRequestAwareAuthenticationSuccessHandler}
  * unless the request from the client contains a "source: typescript" header.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurityConfigurerAdapter.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurityConfigurerAdapter.java
index 0d9bd1e36..325884a76 100644
--- a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurityConfigurerAdapter.java
+++ b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/VaadinWebSecurityConfigurerAdapter.java
@@ -110,7 +110,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 VaadinAwareSecurityContextHolderStrategy.class.getName());
 
         // Respond with 401 Unauthorized HTTP status code for unauthorized
-        // requests for protected Hilla endpoints, so that the response could
+        // requests for protected Fusion endpoints, so that the response could
         // be handled on the client side using e.g. `InvalidSessionMiddleware`.
         http.exceptionHandling()
                 .accessDeniedHandler(createAccessDeniedHandler())
@@ -180,48 +180,48 @@ public static RequestMatcher getDefaultWebSecurityIgnoreMatcher() {
      * Sets up login for the application using form login with the given path
      * for the login view.
      * <p>
-     * This is used when your application uses a Hilla based login view
+     * This is used when your application uses a Fusion based login view
      * available at the given path.
      *
      * @param http
      *            the http security from {@link #configure(HttpSecurity)}
-     * @param hillaLoginViewPath
+     * @param fusionLoginViewPath
      *            the path to the login view
      * @throws Exception
      *             if something goes wrong
      */
-    protected void setLoginView(HttpSecurity http, String hillaLoginViewPath)
+    protected void setLoginView(HttpSecurity http, String fusionLoginViewPath)
             throws Exception {
-        setLoginView(http, hillaLoginViewPath, "/");
+        setLoginView(http, fusionLoginViewPath, "/");
     }
 
     /**
      * Sets up login for the application using form login with the given path
      * for the login view.
      * <p>
-     * This is used when your application uses a Hilla based login view
+     * This is used when your application uses a Fusion based login view
      * available at the given path.
      *
      * @param http
      *            the http security from {@link #configure(HttpSecurity)}
-     * @param hillaLoginViewPath
+     * @param fusionLoginViewPath
      *            the path to the login view
      * @param logoutUrl
      *            the URL to redirect the user to after logging out
      * @throws Exception
      *             if something goes wrong
      */
-    protected void setLoginView(HttpSecurity http, String hillaLoginViewPath,
+    protected void setLoginView(HttpSecurity http, String fusionLoginViewPath,
             String logoutUrl) throws Exception {
         FormLoginConfigurer<HttpSecurity> formLogin = http.formLogin();
-        formLogin.loginPage(hillaLoginViewPath).permitAll();
+        formLogin.loginPage(fusionLoginViewPath).permitAll();
         formLogin.successHandler(
                 getVaadinSavedRequestAwareAuthenticationSuccessHandler(http));
         http.logout().logoutSuccessUrl(logoutUrl);
         http.exceptionHandling().defaultAuthenticationEntryPointFor(
-                new LoginUrlAuthenticationEntryPoint(hillaLoginViewPath),
+                new LoginUrlAuthenticationEntryPoint(fusionLoginViewPath),
                 AnyRequestMatcher.INSTANCE);
-        viewAccessChecker.setLoginView(hillaLoginViewPath);
+        viewAccessChecker.setLoginView(fusionLoginViewPath);
     }
 
     /**
diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/DevModeBrowserLauncherNoPropertiesTest.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/DevModeBrowserLauncherNoPropertiesTest.java
index 725c61713..c0ead8215 100644
--- a/vaadin-spring/src/test/java/com/vaadin/flow/spring/DevModeBrowserLauncherNoPropertiesTest.java
+++ b/vaadin-spring/src/test/java/com/vaadin/flow/spring/DevModeBrowserLauncherNoPropertiesTest.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.flow.spring;
 
-import dev.hilla.HillaControllerConfiguration;
-import dev.hilla.HillaEndpointProperties;
+import com.vaadin.fusion.FusionControllerConfiguration;
+import com.vaadin.fusion.FusionEndpointProperties;
 
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
@@ -26,8 +26,8 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
-@SpringBootTest(classes = { HillaEndpointProperties.class })
-@ContextConfiguration(classes = { HillaControllerConfiguration.class,
+@SpringBootTest(classes = { FusionEndpointProperties.class })
+@ContextConfiguration(classes = { FusionControllerConfiguration.class,
         SpringBootAutoConfiguration.class,
         SpringSecurityAutoConfiguration.class })
 @TestPropertySource(properties = { "server.port = 1244" })
diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/RequestUtilTest.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/RequestUtilTest.java
index 30281d544..ec1de4bca 100644
--- a/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/RequestUtilTest.java
+++ b/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/RequestUtilTest.java
@@ -22,8 +22,8 @@
 import com.vaadin.flow.spring.SpringServlet;
 import com.vaadin.flow.spring.SpringVaadinServletService;
 import com.vaadin.flow.spring.VaadinConfigurationProperties;
-import dev.hilla.HillaControllerConfiguration;
-import dev.hilla.HillaEndpointProperties;
+import com.vaadin.fusion.FusionControllerConfiguration;
+import com.vaadin.fusion.FusionEndpointProperties;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -38,8 +38,8 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { HillaEndpointProperties.class })
-@ContextConfiguration(classes = { HillaControllerConfiguration.class,
+@SpringBootTest(classes = { FusionEndpointProperties.class })
+@ContextConfiguration(classes = { FusionControllerConfiguration.class,
         SpringBootAutoConfiguration.class,
         SpringSecurityAutoConfiguration.class })
 public class RequestUtilTest {
diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/VaadinDefaultRequestCacheTest.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/VaadinDefaultRequestCacheTest.java
index 931b1e4df..fac453695 100644
--- a/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/VaadinDefaultRequestCacheTest.java
+++ b/vaadin-spring/src/test/java/com/vaadin/flow/spring/security/VaadinDefaultRequestCacheTest.java
@@ -20,14 +20,14 @@
 import com.vaadin.flow.server.HandlerHelper.RequestType;
 import com.vaadin.flow.spring.SpringBootAutoConfiguration;
 import com.vaadin.flow.spring.SpringSecurityAutoConfiguration;
-import dev.hilla.Endpoint;
-import dev.hilla.EndpointRegistry;
-import dev.hilla.HillaControllerConfiguration;
-import dev.hilla.HillaEndpointProperties;
+import com.vaadin.fusion.Endpoint;
+import com.vaadin.fusion.EndpointRegistry;
+import com.vaadin.fusion.FusionControllerConfiguration;
+import com.vaadin.fusion.FusionEndpointProperties;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = { HillaEndpointProperties.class })
-@ContextConfiguration(classes = { HillaControllerConfiguration.class,
+@SpringBootTest(classes = { FusionEndpointProperties.class })
+@ContextConfiguration(classes = { FusionControllerConfiguration.class,
         SpringBootAutoConfiguration.class,
         SpringSecurityAutoConfiguration.class })
 public class VaadinDefaultRequestCacheTest {