diff --git a/.gitignore b/.gitignore
index 59338092c39143201cbd8a4861ad2333d073cb6a..85fd6cd2f0bc12505ffe5d05e0ea2ffda583b0a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 node_modules
-demo/dist
+toolkit-showcase/dist
 .idea
 yarn-error.log
\ No newline at end of file
diff --git a/demo/.gitignore b/toolkit-showcase/.gitignore
similarity index 100%
rename from demo/.gitignore
rename to toolkit-showcase/.gitignore
diff --git a/demo/README.md b/toolkit-showcase/README.md
similarity index 97%
rename from demo/README.md
rename to toolkit-showcase/README.md
index 01efd9d42b33b0a014d157e205618137993d24b8..65d449d3011c262c36ba94b267462650b98c7466 100644
--- a/demo/README.md
+++ b/toolkit-showcase/README.md
@@ -1,4 +1,4 @@
-# Frontend Toolkit Demo
+# Frontend Toolkit Showcase
 
 ## Setup
 
diff --git a/demo/assets/.htaccess.ejs b/toolkit-showcase/assets/.htaccess.ejs
similarity index 100%
rename from demo/assets/.htaccess.ejs
rename to toolkit-showcase/assets/.htaccess.ejs
diff --git a/demo/assets/Makefile b/toolkit-showcase/assets/Makefile
similarity index 100%
rename from demo/assets/Makefile
rename to toolkit-showcase/assets/Makefile
diff --git a/demo/assets/check-in-place-select.metadata.json b/toolkit-showcase/assets/check-in-place-select.metadata.json
similarity index 100%
rename from demo/assets/check-in-place-select.metadata.json
rename to toolkit-showcase/assets/check-in-place-select.metadata.json
diff --git a/demo/assets/common.metadata.json b/toolkit-showcase/assets/common.metadata.json
similarity index 100%
rename from demo/assets/common.metadata.json
rename to toolkit-showcase/assets/common.metadata.json
diff --git a/demo/assets/data-table-view.metadata.json b/toolkit-showcase/assets/data-table-view.metadata.json
similarity index 100%
rename from demo/assets/data-table-view.metadata.json
rename to toolkit-showcase/assets/data-table-view.metadata.json
diff --git a/demo/assets/dbp-toolkit-demo.html.ejs b/toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
similarity index 100%
rename from demo/assets/dbp-toolkit-demo.html.ejs
rename to toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
diff --git a/demo/assets/dbp-toolkit-demo.topic.metadata.json.ejs b/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
similarity index 83%
rename from demo/assets/dbp-toolkit-demo.topic.metadata.json.ejs
rename to toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
index 9ce40533449ca6f0c93fa68815d258561f92759d..1d5236f9b5122863afc8805bee685d8783e83c77 100644
--- a/demo/assets/dbp-toolkit-demo.topic.metadata.json.ejs
+++ b/toolkit-showcase/assets/dbp-toolkit-showcase.topic.metadata.json.ejs
@@ -1,17 +1,17 @@
 {
   "name": {
-    "de": "Toolkit Demo",
-    "en": "Toolkit Demo"
+    "de": "Toolkit Showcase",
+    "en": "Toolkit Showcase"
   },
   "short_name": {
-    "de": "Toolkit Demo",
-    "en": "Toolkit Demo"
+    "de": "Toolkit Showcase",
+    "en": "Toolkit Showcase"
   },
   "description": {
     "de": "Mit dieser Applikation die Funktion der DBP Web Components testen",
     "en": "With this application you can test the function of the DBP web components"
   },
-  "routing_name": "toolkit-demo",
+  "routing_name": "toolkit-showcase",
   "activities": [
     {"path": "person-select.metadata.json"},
     {"path": "knowledge-base-web-page-element-view.metadata.json"},
diff --git a/demo/assets/file-handling.metadata.json b/toolkit-showcase/assets/file-handling.metadata.json
similarity index 100%
rename from demo/assets/file-handling.metadata.json
rename to toolkit-showcase/assets/file-handling.metadata.json
diff --git a/demo/assets/icon-192.png b/toolkit-showcase/assets/icon-192.png
similarity index 100%
rename from demo/assets/icon-192.png
rename to toolkit-showcase/assets/icon-192.png
diff --git a/demo/assets/icon-512.png b/toolkit-showcase/assets/icon-512.png
similarity index 100%
rename from demo/assets/icon-512.png
rename to toolkit-showcase/assets/icon-512.png
diff --git a/demo/assets/knowledge-base-web-page-element-view.metadata.json b/toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
similarity index 100%
rename from demo/assets/knowledge-base-web-page-element-view.metadata.json
rename to toolkit-showcase/assets/knowledge-base-web-page-element-view.metadata.json
diff --git a/demo/assets/language-select.metadata.json b/toolkit-showcase/assets/language-select.metadata.json
similarity index 100%
rename from demo/assets/language-select.metadata.json
rename to toolkit-showcase/assets/language-select.metadata.json
diff --git a/demo/assets/logo.svg b/toolkit-showcase/assets/logo.svg
similarity index 100%
rename from demo/assets/logo.svg
rename to toolkit-showcase/assets/logo.svg
diff --git a/demo/assets/manifest.json b/toolkit-showcase/assets/manifest.json
similarity index 51%
rename from demo/assets/manifest.json
rename to toolkit-showcase/assets/manifest.json
index 6e1b9c8a1e81cf59793c1b66ae4e738c23959034..ceb665e95345c5f4a69b726bd03d6fe74892e045 100644
--- a/demo/assets/manifest.json
+++ b/toolkit-showcase/assets/manifest.json
@@ -1,15 +1,15 @@
 {
-  "short_name": "Toolkit Demo",
-  "name": "Toolkit Demo",
-  "start_url": "./dbp-toolkit-demo.html",
+  "short_name": "Toolkit Showcase",
+  "name": "Toolkit Showcase",
+  "start_url": "./dbp-toolkit-showcase.html",
   "icons": [
     {
-      "src": "local/dbp-toolkit-demo/icon-192.png",
+      "src": "local/dbp-toolkit-showcase/icon-192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "local/dbp-toolkit-demo/icon-512.png",
+      "src": "local/dbp-toolkit-showcase/icon-512.png",
       "type": "image/png",
       "sizes": "512x512"
     }
diff --git a/demo/assets/matomo.metadata.json b/toolkit-showcase/assets/matomo.metadata.json
similarity index 100%
rename from demo/assets/matomo.metadata.json
rename to toolkit-showcase/assets/matomo.metadata.json
diff --git a/demo/assets/notification.metadata.json b/toolkit-showcase/assets/notification.metadata.json
similarity index 100%
rename from demo/assets/notification.metadata.json
rename to toolkit-showcase/assets/notification.metadata.json
diff --git a/demo/assets/person-profile.metadata.json b/toolkit-showcase/assets/person-profile.metadata.json
similarity index 100%
rename from demo/assets/person-profile.metadata.json
rename to toolkit-showcase/assets/person-profile.metadata.json
diff --git a/demo/assets/person-select.metadata.json b/toolkit-showcase/assets/person-select.metadata.json
similarity index 100%
rename from demo/assets/person-select.metadata.json
rename to toolkit-showcase/assets/person-select.metadata.json
diff --git a/demo/assets/qr-code-scanner.metadata.json b/toolkit-showcase/assets/qr-code-scanner.metadata.json
similarity index 100%
rename from demo/assets/qr-code-scanner.metadata.json
rename to toolkit-showcase/assets/qr-code-scanner.metadata.json
diff --git a/demo/assets/silent-check-sso.html b/toolkit-showcase/assets/silent-check-sso.html
similarity index 100%
rename from demo/assets/silent-check-sso.html
rename to toolkit-showcase/assets/silent-check-sso.html
diff --git a/demo/package.json b/toolkit-showcase/package.json
similarity index 97%
rename from demo/package.json
rename to toolkit-showcase/package.json
index 850d3ec84a6963ab86186b6f888f3c2153630b01..44a702b608da31331df6e5737b0c9190e4239050 100644
--- a/demo/package.json
+++ b/toolkit-showcase/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "dbp-toolkit-demo",
+  "name": "dbp-toolkit-showcase",
   "version": "0.1.0",
-  "main": "src/toolkit-demo.js",
+  "main": "src/toolkit-showcase.js",
   "license": "LGPL-2.1-or-later",
   "private": true,
   "workspaces": [
diff --git a/demo/rollup.config.js b/toolkit-showcase/rollup.config.js
similarity index 99%
rename from demo/rollup.config.js
rename to toolkit-showcase/rollup.config.js
index 2f09787a6f41d04d5f9269728fb27fb8ccd8c83e..2c3c7f59596ded932cbbef164ac75b75b539f656 100644
--- a/demo/rollup.config.js
+++ b/toolkit-showcase/rollup.config.js
@@ -62,7 +62,7 @@ switch (build) {
     pdfAsQualifiedlySigningServer = 'sig-dev.tugraz.at';
     break;
   case 'development':
-    basePath = '/apps/toolkit-demo/';
+    basePath = '/apps/toolkit-showcase/';
     entryPointURL = 'https://mw-dev.tugraz.at';
     // "/pers" can't go here because it's not allowed in the "Content-Security-Policy"
     nextcloudBaseURL = 'https://nc-dev.tugraz.at';
diff --git a/demo/src/dbp-check-in-place-select-demo-activity.js b/toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js
similarity index 100%
rename from demo/src/dbp-check-in-place-select-demo-activity.js
rename to toolkit-showcase/src/dbp-check-in-place-select-demo-activity.js
diff --git a/demo/src/dbp-common-demo-activity.js b/toolkit-showcase/src/dbp-common-demo-activity.js
similarity index 100%
rename from demo/src/dbp-common-demo-activity.js
rename to toolkit-showcase/src/dbp-common-demo-activity.js
diff --git a/demo/src/dbp-data-table-view-demo-activity.js b/toolkit-showcase/src/dbp-data-table-view-demo-activity.js
similarity index 100%
rename from demo/src/dbp-data-table-view-demo-activity.js
rename to toolkit-showcase/src/dbp-data-table-view-demo-activity.js
diff --git a/demo/src/dbp-demo-template.js b/toolkit-showcase/src/dbp-demo-template.js
similarity index 100%
rename from demo/src/dbp-demo-template.js
rename to toolkit-showcase/src/dbp-demo-template.js
diff --git a/demo/src/dbp-file-handling-demo-activity.js b/toolkit-showcase/src/dbp-file-handling-demo-activity.js
similarity index 100%
rename from demo/src/dbp-file-handling-demo-activity.js
rename to toolkit-showcase/src/dbp-file-handling-demo-activity.js
diff --git a/demo/src/dbp-knowledge-base-web-page-element-view-demo-activity.js b/toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
similarity index 100%
rename from demo/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
rename to toolkit-showcase/src/dbp-knowledge-base-web-page-element-view-demo-activity.js
diff --git a/demo/src/dbp-language-select-demo-activity.js b/toolkit-showcase/src/dbp-language-select-demo-activity.js
similarity index 100%
rename from demo/src/dbp-language-select-demo-activity.js
rename to toolkit-showcase/src/dbp-language-select-demo-activity.js
diff --git a/demo/src/dbp-matomo-demo-activity.js b/toolkit-showcase/src/dbp-matomo-demo-activity.js
similarity index 100%
rename from demo/src/dbp-matomo-demo-activity.js
rename to toolkit-showcase/src/dbp-matomo-demo-activity.js
diff --git a/demo/src/dbp-notification-demo-activity.js b/toolkit-showcase/src/dbp-notification-demo-activity.js
similarity index 100%
rename from demo/src/dbp-notification-demo-activity.js
rename to toolkit-showcase/src/dbp-notification-demo-activity.js
diff --git a/demo/src/dbp-person-profile-demo-activity.js b/toolkit-showcase/src/dbp-person-profile-demo-activity.js
similarity index 100%
rename from demo/src/dbp-person-profile-demo-activity.js
rename to toolkit-showcase/src/dbp-person-profile-demo-activity.js
diff --git a/demo/src/dbp-person-select-demo-activity.js b/toolkit-showcase/src/dbp-person-select-demo-activity.js
similarity index 100%
rename from demo/src/dbp-person-select-demo-activity.js
rename to toolkit-showcase/src/dbp-person-select-demo-activity.js
diff --git a/demo/src/dbp-qr-code-scanner-demo-activity.js b/toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js
similarity index 100%
rename from demo/src/dbp-qr-code-scanner-demo-activity.js
rename to toolkit-showcase/src/dbp-qr-code-scanner-demo-activity.js
diff --git a/demo/src/dbp-toolkit-demo.js b/toolkit-showcase/src/dbp-toolkit-showcase.js
similarity index 61%
rename from demo/src/dbp-toolkit-demo.js
rename to toolkit-showcase/src/dbp-toolkit-showcase.js
index 42a9c8bb9f6f86d19a653bfcd1ffd92ce46d5a33..89c224bbe6053071aa7471c359d34a10ab82f2b7 100644
--- a/demo/src/dbp-toolkit-demo.js
+++ b/toolkit-showcase/src/dbp-toolkit-showcase.js
@@ -1,4 +1,4 @@
 import {AppShell} from '@dbp-toolkit/app-shell';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 
-commonUtils.defineCustomElement('dbp-toolkit-demo', AppShell);
+commonUtils.defineCustomElement('dbp-toolkit-showcase', AppShell);
diff --git a/demo/src/styles.js b/toolkit-showcase/src/styles.js
similarity index 100%
rename from demo/src/styles.js
rename to toolkit-showcase/src/styles.js
diff --git a/demo/yarn.lock b/toolkit-showcase/yarn.lock
similarity index 100%
rename from demo/yarn.lock
rename to toolkit-showcase/yarn.lock