diff --git a/assets/vpu-signature.html.ejs b/assets/vpu-signature.html.ejs
index 27bb4b89da1120f1bb91c7804f037953fea8db33..b8a5af5c7df26e66f16c72344c2fddcef113e327 100644
--- a/assets/vpu-signature.html.ejs
+++ b/assets/vpu-signature.html.ejs
@@ -16,7 +16,7 @@
 <% } -%>
 
     <!-- PWA manfiest file -->
-    <link rel="manifest" href="<%= geturl('vpu-signature.manifest.json') %>">
+    <link rel="manifest" href="<%= geturl(name + '.manifest.json') %>">
 
     <!-- Loading spinner -->
     <script type="module">
@@ -25,7 +25,7 @@
     </script>
 
     <!-- App bundles-->
-    <script type="module" src="<%= geturl('vpu-signature.js') %>"></script>
+    <script type="module" src="<%= geturl(name + '.js') %>"></script>
 
     <!-- Prevent Chrome/Edge from suggesting to translate the page -->
     <meta name="google" content="notranslate">
@@ -129,13 +129,13 @@
 </head>
 
 <body>
-<vpu-app-signature
+<<%= name %>
     lang="de"
-    src="<%= geturl('vpu-signature.topic.metadata.json') %>"
+    src="<%= geturl(name + '.topic.metadata.json') %>"
     entry-point-url="<%= entryPointURL %>"
     base-path="<%= geturl('') %>"
     keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= geturl('silent-check-sso.html') %>"}'
-><vpu-loading-spinner></vpu-loading-spinner></vpu-app-signature>
+><vpu-loading-spinner></vpu-loading-spinner></<%= name %>>
 
 <!-- Error handling for too old browsers -->
 <script src="<%= getprivateurl('browser-check.js') %>" defer></script>
diff --git a/rollup.config.js b/rollup.config.js
index 122407d1201ce3383c4a83174b5ae1a620b59eb9..5cb8f8c0c518aa000fda8b3af5a9fdfc9acbacce 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -164,7 +164,7 @@ function getBuildInfo() {
 
 export default {
     input: (build != 'test') ? [
-      'src/vpu-signature.js',
+      'src/' + pkg.name + '.js',
       'src/vpu-official-signature-pdf-upload.js',
       'src/vpu-qualified-signature-pdf-upload.js',
     ] : glob.sync('test/**/*.js'),
@@ -215,6 +215,7 @@ export default {
             getprivateurl: (p) => {
                 return url.resolve(`${basePath}local/${pkg.name}/`, p);
             },
+            name: pkg.name,
             entryPointURL: entryPointURL,
             keyCloakServer: keyCloakServer,
             keyCloakBaseURL: keyCloakBaseURL,
diff --git a/src/vpu-signature.js b/src/vpu-signature.js
index c9a1eda8232bb60db27fe08decde6f816b145b9b..638b7ff0a2e585bf76804b3d1bc4293b4cacc075 100644
--- a/src/vpu-signature.js
+++ b/src/vpu-signature.js
@@ -1,4 +1,4 @@
 import {AppShell} from 'vpu-app-shell';
 import * as commonUtils from 'vpu-common/utils';
 
-commonUtils.defineCustomElement('vpu-app-signature', AppShell);
\ No newline at end of file
+commonUtils.defineCustomElement('vpu-signature', AppShell);
\ No newline at end of file